diff options
author | Radek Vykydal <rvykydal@redhat.com> | 2009-10-13 15:07:44 +0200 |
---|---|---|
committer | Radek Vykydal <rvykydal@redhat.com> | 2009-10-13 15:07:44 +0200 |
commit | c685457b4598818ef105b3de1e1a9be670412e00 (patch) | |
tree | 6125a3858a5041485a1b58a2132a59c0bc3611c0 | |
parent | 592b83491b8f20a6e6126a85c9b399339f1cac57 (diff) | |
download | anaconda-c685457b4598818ef105b3de1e1a9be670412e00.tar.gz anaconda-c685457b4598818ef105b3de1e1a9be670412e00.tar.xz anaconda-c685457b4598818ef105b3de1e1a9be670412e00.zip |
Fix methodstr editing dialog.
We need to pass dummy repo object. Also pass methodstr as argument.
-rwxr-xr-x | gui.py | 4 | ||||
-rw-r--r-- | iw/task_gui.py | 9 | ||||
-rw-r--r-- | yuminstall.py | 2 |
3 files changed, 10 insertions, 5 deletions
@@ -1048,9 +1048,9 @@ class InstallInterface: dialog.createDialog() dialog.run() - def methodstrRepoWindow(self): + def methodstrRepoWindow(self, methodstr): from task_gui import RepoMethodstrEditor - dialog = RepoMethodstrEditor(self.anaconda) + dialog = RepoMethodstrEditor(self.anaconda, methodstr) dialog.createDialog() return dialog.run() diff --git a/iw/task_gui.py b/iw/task_gui.py index cb9400400..29966528f 100644 --- a/iw/task_gui.py +++ b/iw/task_gui.py @@ -395,8 +395,13 @@ class RepoEditor: return rc class RepoMethodstrEditor(RepoEditor): - def __init__(self, anaconda): - RepoEditor.__init__(self, anaconda, None) + def __init__(self, anaconda, methodstr): + # Create temporary repo to store methodstr needed for + # createDialog parent method. + temprepo = AnacondaYumRepo("UITmpMethodstrRepo") + temprepo.name = "Installation Repo" + temprepo.anacondaBaseURLs = [methodstr] + RepoEditor.__init__(self, anaconda, temprepo) def createDialog(self): RepoEditor.createDialog(self) diff --git a/yuminstall.py b/yuminstall.py index e2cf98cd5..26efd5433 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -334,7 +334,7 @@ class AnacondaYum(YumSorter): "installation repository:\n\n%s\n\nPlease provide the " "correct information for installing %s.") % (e, productName)) - self.anaconda.methodstr = self.anaconda.intf.methodstrRepoWindow() + self.anaconda.methodstr = self.anaconda.intf.methodstrRepoWindow(self.anaconda.methodstr or "cdrom:") self.doConfigSetup(root=self.anaconda.rootPath) self.conf.installonlypkgs = [] |