diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | image.py | 2 | ||||
| -rw-r--r-- | installmethod.py | 1 | ||||
| -rw-r--r-- | yuminstall.py | 29 |
4 files changed, 19 insertions, 20 deletions
@@ -6,6 +6,13 @@ * loader2/loader.c (main): Add anaconda's version number to the string that gets displayed on screen for a while. + * image.py (ImageInstallMethod.__init__, NfsInstallMethod.__init__): + Drop splitmethod attribute. + * installmethod.py (InstallMethod.__init__): Likewise. + + * yuminstall.py (AnacondaYum.run): One "disc" media is just a special + case of multiple discs. + 2007-08-13 Jeremy Katz <katzj@redhat.com> * scripts/upd-instroot (expandPackageSet): Dynamically determine @@ -116,7 +116,6 @@ class ImageInstallMethod(InstallMethod): InstallMethod.__init__(self, tree, rootPath, intf) self.tree = tree self.isoPath = tree - self.splitmethod = True class CdromInstallMethod(ImageInstallMethod): @@ -360,7 +359,6 @@ class NfsInstallMethod(ImageInstallMethod): """@param method: nfs:/mnt/source""" tree = method[5:] ImageInstallMethod.__init__(self, tree, rootPath, intf) - self.splitmethod = False self.currentMedia = [] def getDiscNums(line): diff --git a/installmethod.py b/installmethod.py index e8155e6b9..20e9af476 100644 --- a/installmethod.py +++ b/installmethod.py @@ -92,7 +92,6 @@ class InstallMethod: self.rootPath = rootpath self.intf = intf self.tree = None - self.splitmethod = False ## Get the base URI for the method. # @return The base URI for this installation method. diff --git a/yuminstall.py b/yuminstall.py index 0fadb37fc..b699a98cf 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -439,31 +439,26 @@ class AnacondaYum(YumSorter): elif a > b: return 1 return 0 - + self.initActionTs() if id.getUpgrade(): self.ts.ts.setProbFilter(~rpm.RPMPROB_FILTER_DISKSPACE) self.setColor() - if not self.method.splitmethod: + + # If we don't have any required media assume single disc + if self.tsInfo.reqmedia == {}: + self.tsInfo.reqmedia[0] = None + mkeys = self.tsInfo.reqmedia.keys() + mkeys.sort(mediasort) + for i in mkeys: + self.tsInfo.curmedia = i + if i > 0: + pkgtup = self.tsInfo.reqmedia[i][0] + self.method.switchMedia(i, filename=pkgtup) self.populateTs(keepold=0) self.ts.check() self.ts.order() self._run(instLog, cb, intf) - else: - # If we don't have any required media assume single disc - if self.tsInfo.reqmedia == {}: - self.tsInfo.reqmedia[0] = None - mkeys = self.tsInfo.reqmedia.keys() - mkeys.sort(mediasort) - for i in mkeys: - self.tsInfo.curmedia = i - if i > 0: - pkgtup = self.tsInfo.reqmedia[i][0] - self.method.switchMedia(i, filename=pkgtup) - self.populateTs(keepold=0) - self.ts.check() - self.ts.order() - self._run(instLog, cb, intf) def _run(self, instLog, cb, intf): # set log fd. FIXME: this is ugly. see changelog entry from 2005-09-13 |