diff options
| -rw-r--r-- | harddrive.py | 2 | ||||
| -rw-r--r-- | image.py | 2 | ||||
| -rw-r--r-- | installmethod.py | 18 | ||||
| -rw-r--r-- | urlinstall.py | 2 |
4 files changed, 4 insertions, 20 deletions
diff --git a/harddrive.py b/harddrive.py index 23e47e430..291754817 100644 --- a/harddrive.py +++ b/harddrive.py @@ -99,7 +99,7 @@ class HardDriveInstallMethod(InstallMethod): self.tree = None self.isoDirIsMounted = 0 - def readCompsViaMethod(self, hdlist): + def readComps(self, hdlist): self.mountMedia(1) fname = self.findBestFileMatch(self.tree, 'comps.xml') cs = groupSetFromCompsFile(fname, hdlist) @@ -101,7 +101,7 @@ def presentRequiredMediaMessage(intf, grpset): class ImageInstallMethod(InstallMethod): - def readCompsViaMethod(self, hdlist): + def readComps(self, hdlist): fname = self.findBestFileMatch(self.tree, 'comps.xml') if fname is None: raise FileCopyException diff --git a/installmethod.py b/installmethod.py index a02df6c1a..8efdc3b2c 100644 --- a/installmethod.py +++ b/installmethod.py @@ -47,24 +47,8 @@ class InstallMethod: def protectedPartitions(self): return None - def readCompsViaMethod(self, hdlist): - pass - def readComps(self, hdlist): - # see if there is a comps in PYTHONPATH, otherwise fall thru - # to method dependent location - path = None - if os.environ.has_key('PYTHONPATH'): - for f in string.split(os.environ['PYTHONPATH'], ":"): - if os.access (f+"/comps", os.X_OK): - path = f+"/comps" - break - - if path: - return groupSetFromCompsFile(path, hdlist) - else: - return self.readCompsViaMethod(hdlist) - pass + pass def getTempPath(self): root = self.rootPath diff --git a/urlinstall.py b/urlinstall.py index e27ad44d7..e955ceb14 100644 --- a/urlinstall.py +++ b/urlinstall.py @@ -80,7 +80,7 @@ def urlretrieve(location, file, callback=None): url.close() class UrlInstallMethod(InstallMethod): - def readCompsViaMethod(self, hdlist): + def readComps(self, hdlist): fname = self.findBestFileMatch(None, 'comps.xml') # if not local then assume its on host if fname is None: |