summaryrefslogtreecommitdiffstats
path: root/harddrive.py
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>2002-07-31 00:42:45 +0000
committerMike Fulbright <msf@redhat.com>2002-07-31 00:42:45 +0000
commitdc33b950c545c30e7872dd58664f8088545cd44b (patch)
treeeb40ff3155caac122292066c5b7357c0982dd469 /harddrive.py
parent6919ce27faac2e2f261a473e86739a4480e5bd5c (diff)
downloadanaconda-dc33b950c545c30e7872dd58664f8088545cd44b.tar.gz
anaconda-dc33b950c545c30e7872dd58664f8088545cd44b.tar.xz
anaconda-dc33b950c545c30e7872dd58664f8088545cd44b.zip
get comps.xml from multiple sources
Diffstat (limited to 'harddrive.py')
-rw-r--r--harddrive.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/harddrive.py b/harddrive.py
index 5cca25b29..c50c62bc4 100644
--- a/harddrive.py
+++ b/harddrive.py
@@ -60,8 +60,8 @@ class OldHardDriveInstallMethod(InstallMethod):
def readCompsViaMethod(self, hdlist):
self.mountMedia()
- cs = ComponentSet(self.tree + self.path +
- '/RedHat/base/comps.xml', hdlist)
+ fname = self.findBestFileMatch(self.tree + self.path, 'comps.xml')
+ cs = ComponentSet(fname, hdlist)
self.umountMedia()
return cs
@@ -163,7 +163,8 @@ class HardDriveInstallMethod(InstallMethod):
def readCompsViaMethod(self, hdlist):
self.mountMedia(1)
- cs = ComponentSet(self.tree + '/RedHat/base/comps.xml', hdlist)
+ fname = self.findBestFileMatch(self.tree, 'comps.xml')
+ cs = ComponentSet(fname, hdlist)
self.umountMedia()
return cs