diff options
| -rw-r--r-- | cmdline.py | 8 | ||||
| -rwxr-xr-x | gui.py | 4 | ||||
| -rw-r--r-- | instdata.py | 3 | ||||
| -rw-r--r-- | iw/progress_gui.py | 2 | ||||
| -rw-r--r-- | livecd.py | 4 | ||||
| -rw-r--r-- | text.py | 4 | ||||
| -rw-r--r-- | textw/progress_text.py | 4 | ||||
| -rw-r--r-- | yuminstall.py | 4 |
8 files changed, 21 insertions, 12 deletions
diff --git a/cmdline.py b/cmdline.py index 700e74148..86816be9c 100644 --- a/cmdline.py +++ b/cmdline.py @@ -66,6 +66,7 @@ class InstallInterface: def __init__(self): # signal.signal(signal.SIGINT, signal.SIG_IGN) signal.signal(signal.SIGTSTP, signal.SIG_DFL) + self.instProgress = None def __del__(self): pass @@ -178,6 +179,9 @@ class InstallInterface: anaconda.dispatch.gotoNext() (step, instance) = anaconda.dispatch.currentStep() + def setInstallProgressClass(self, c): + self.instProgress = c + def setSteps(self, anaconda): pass @@ -207,9 +211,9 @@ class progressDisplay: def setupProgressDisplay(anaconda): if anaconda.dir == DISPATCH_BACK: - anaconda.id.setInstallProgressClass(None) + anaconda.intf.setInstallProgressClass(None) return DISPATCH_BACK else: - anaconda.id.setInstallProgressClass(progressDisplay()) + anaconda.intf.setInstallProgressClass(progressDisplay()) return DISPATCH_FORWARD @@ -977,6 +977,7 @@ class EntryWindow(MessageWindow): class InstallInterface: def __init__ (self): self.icw = None + self.installProgress = None # figure out if we want to run interface at 800x600 or 640x480 if gtk.gdk.screen_width() >= 800: @@ -1011,6 +1012,9 @@ class InstallInterface: return ret not in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT] + def setInstallProgressClass(self, c): + self.instProgress = c + def setPackageProgressWindow (self, ppw): self.ppw = ppw diff --git a/instdata.py b/instdata.py index 972990421..07815b739 100644 --- a/instdata.py +++ b/instdata.py @@ -84,9 +84,6 @@ class InstallData: else: self.firstboot = FIRSTBOOT_DEFAULT - def setInstallProgressClass(self, c): - self.instProgress = c - # if upgrade is None, it really means False. we use None to help the # installer ui figure out if it's the first time the user has entered # the examine_gui screen. --dcantrell diff --git a/iw/progress_gui.py b/iw/progress_gui.py index 7cb11d2fa..a72b5263f 100644 --- a/iw/progress_gui.py +++ b/iw/progress_gui.py @@ -143,7 +143,7 @@ class InstallProgressWindow (InstallWindow): # All done with creating components of UI self.intf.setPackageProgressWindow(self) - anaconda.id.setInstallProgressClass(self) + self.intf.setInstallProgressClass(self) vbox.set_border_width(6) @@ -176,7 +176,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend): def doInstall(self, anaconda): log.info("Preparing to install packages") - progress = anaconda.id.instProgress + progress = anaconda.intf.instProgress progress.set_label(_("Copying live image to hard drive.")) progress.processEvents() @@ -221,7 +221,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend): os.close(osfd) os.close(rootfd) - anaconda.id.instProgress = None + anaconda.intf.setInstallProgressClass(None) def _doFilesystemMangling(self, anaconda): # FIXME: this whole method is a big fucking mess @@ -261,6 +261,9 @@ class InstallInterface: def progressWindow(self, title, text, total, updpct = 0.05, pulse = False): return ProgressWindow(self.screen, title, text, total, updpct, pulse) + def setInstallProgressClass(self, c): + self.instProgress = c + def exitWindow(self, title, text): return self.messageWindow(title, text, type="custom", custom_buttons=[_("Exit installer")]) @@ -437,6 +440,7 @@ class InstallInterface: signal.signal(signal.SIGINT, signal.SIG_IGN) signal.signal(signal.SIGTSTP, signal.SIG_IGN) self.screen = SnackScreen() + self.instProgress = None self._initLabelAnswers = {} self._inconsistentLVMAnswers = {} diff --git a/textw/progress_text.py b/textw/progress_text.py index c2d10edf8..579408a31 100644 --- a/textw/progress_text.py +++ b/textw/progress_text.py @@ -106,10 +106,10 @@ class setupForInstall: def __call__(self, screen, anaconda): if anaconda.dir == DISPATCH_BACK: - anaconda.id.setInstallProgressClass(None) + anaconda.intf.setInstallProgressClass(None) return INSTALL_BACK - anaconda.id.setInstallProgressClass(InstallProgressWindow(screen)) + anaconda.intf.setInstallProgressClass(InstallProgressWindow(screen)) return INSTALL_OK if __name__ == "__main__": diff --git a/yuminstall.py b/yuminstall.py index 294be46a8..e178158dc 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -100,7 +100,7 @@ class AnacondaCallback: self.messageWindow = anaconda.intf.messageWindow self.pulseWindow = anaconda.intf.progressWindow - self.progress = anaconda.id.instProgress + self.progress = anaconda.intf.instProgress self.progressWindowClass = anaconda.intf.progressWindow self.rootPath = anaconda.rootPath @@ -1696,7 +1696,7 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon self.instLog.write("*** FINISHED INSTALLING PACKAGES ***") self.instLog.close () - anaconda.id.instProgress = None + anaconda.intf.setInstallProgressClass(None) if rc == DISPATCH_BACK: return DISPATCH_BACK |