diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-11-08 15:37:00 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-11-08 15:37:00 +0000 |
| commit | dfe810f0ba6b09410a29983af19e0a28ea475071 (patch) | |
| tree | 7d6920deb06ea9fcb7f3762dacda3a0b0a91ae4e /scripts | |
| parent | 2b5194e8dc6df2b7b703d9172afd2e4e4c0e4119 (diff) | |
| download | anaconda-dfe810f0ba6b09410a29983af19e0a28ea475071.tar.gz anaconda-dfe810f0ba6b09410a29983af19e0a28ea475071.tar.xz anaconda-dfe810f0ba6b09410a29983af19e0a28ea475071.zip | |
2006-11-08 Jeremy Katz <katzj@redhat.com>
* scripts/splittree.py: Don't fail with non-rpms in the
directory; don't link rpms multiple times (jkeating)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/splittree.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/splittree.py b/scripts/splittree.py index 9e8c0bd34..d9705657a 100644 --- a/scripts/splittree.py +++ b/scripts/splittree.py @@ -199,7 +199,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc. for i in range(self.bin_list[0], self.bin_list[-1] + 1): if i == 1: - p = os.popen('find %s/ -type f -not -name .discinfo' % self.dist_dir, 'r') + p = os.popen('find %s/ -type f -not -name .discinfo -not -name "*\.rpm"' % self.dist_dir, 'r') filelist = p.read() p.close() filelist = string.split(filelist) @@ -261,7 +261,10 @@ self.reserve_size : Additional size needed to be reserved on the first disc. # create the packages dictionary in this format: n-v-r.a:['n-v-r.arch.rpm'] for filename in rpmlist: filesize = os.path.getsize("%s/%s/%s" % (self.dist_dir, pkgdir, filename)) - pkg_nvr = nvra("%s/%s/%s" %(self.dist_dir, pkgdir, filename)) + try: + pkg_nvr = nvra("%s/%s/%s" %(self.dist_dir, pkgdir, filename)) + except rpm.error, e: + continue if packages.has_key(pkg_nvr): # append in case we have multiple packages with the |