summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>1999-10-28 22:23:11 +0000
committerMatt Wilson <msw@redhat.com>1999-10-28 22:23:11 +0000
commit02dad93c414b18576534a4223fde88938cd3edbd (patch)
treed92e85e042abe5fec6f26a7a4b8e8c0e3eb4bbf5
parent7c70aa386c90ef6095b47ff5260e36638f0f06b6 (diff)
downloadanaconda-02dad93c414b18576534a4223fde88938cd3edbd.tar.gz
anaconda-02dad93c414b18576534a4223fde88938cd3edbd.tar.xz
anaconda-02dad93c414b18576534a4223fde88938cd3edbd.zip
kip over non-rpm files
-rw-r--r--harddrive.py10
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")