diff options
| author | Matt Wilson <msw@redhat.com> | 1999-11-23 21:08:56 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-11-23 21:08:56 +0000 |
| commit | c3d5a7b0d5d8aafbd13ef57147e0920c8410d1ef (patch) | |
| tree | 1065f8143691c136cfc1d01b70e7bab93ac5aa43 /harddrive.py | |
| parent | c6949a368ffe68f43f1eddb6973e5eabeb140833 (diff) | |
| download | anaconda-c3d5a7b0d5d8aafbd13ef57147e0920c8410d1ef.tar.gz anaconda-c3d5a7b0d5d8aafbd13ef57147e0920c8410d1ef.tar.xz anaconda-c3d5a7b0d5d8aafbd13ef57147e0920c8410d1ef.zip | |
merge with anaconda-6-1-1-merge-2
Diffstat (limited to 'harddrive.py')
| -rw-r--r-- | harddrive.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/harddrive.py b/harddrive.py index 2738bf841..4c31c6582 100644 --- a/harddrive.py +++ b/harddrive.py @@ -30,16 +30,14 @@ class InstallMethod: hl = [] path = "/tmp/hdimage" + self.path + "/RedHat/RPMS" for n in os.listdir(path): -# no gurantee on suffix - do a copy onto msdos filesytem from -# linux and you don't get .rpm -# if (n[len(n) - 4:] == '.rpm'): fd = os.open(path + "/" + n, 0) try: (h, isSource) = rpm.headerFromPackage(fd) + if (h and not isSource): + self.fnames[h] = n + hl.append(h) except: - continue - self.fnames[h] = n - hl.append(h) + pass os.close(fd) isys.umount("/tmp/hdimage") |