| 1 |
commit: dabcdc8fbf8afce8421865501d46d437137cae02 |
| 2 |
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net> |
| 3 |
AuthorDate: Sun Jul 3 18:52:33 2011 +0000 |
| 4 |
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net> |
| 5 |
CommitDate: Sun Jul 3 18:52:33 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=dabcdc8f |
| 7 |
|
| 8 |
re-enable makeconf |
| 9 |
|
| 10 |
--- |
| 11 |
dispatch.py | 2 +- |
| 12 |
gui.py | 2 +- |
| 13 |
iw/makeconf_gui.py | 6 ------ |
| 14 |
3 files changed, 2 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dispatch.py b/dispatch.py |
| 17 |
index a3dd360..073dc2c 100644 |
| 18 |
--- a/dispatch.py |
| 19 |
+++ b/dispatch.py |
| 20 |
@@ -93,7 +93,7 @@ installSteps = [ |
| 21 |
("enablefilesystems", turnOnFilesystems, ), |
| 22 |
|
| 23 |
# Installing the Gentoo Installation Files |
| 24 |
- #("makeconf", ), |
| 25 |
+ ("makeconf", ), |
| 26 |
|
| 27 |
# Installing the Gentoo Base System |
| 28 |
("mirrorselect", ), |
| 29 |
|
| 30 |
diff --git a/gui.py b/gui.py |
| 31 |
index 343d55a..addce82 100755 |
| 32 |
--- a/gui.py |
| 33 |
+++ b/gui.py |
| 34 |
@@ -77,7 +77,7 @@ stepToClass = { |
| 35 |
"upgrademigratefs" : ("upgrade_migratefs_gui", "UpgradeMigrateFSWindow"), |
| 36 |
|
| 37 |
# Installing the Gentoo Installation Files |
| 38 |
- #"makeconf" : ("makeconf_gui", "MakeconfWindow"), |
| 39 |
+ "makeconf" : ("makeconf_gui", "MakeconfWindow"), |
| 40 |
|
| 41 |
# Installing the Gentoo Base System |
| 42 |
"mirrorselect": ("mirrorselect_gui", "MirrorselectWindow"), |
| 43 |
|
| 44 |
diff --git a/iw/makeconf_gui.py b/iw/makeconf_gui.py |
| 45 |
index 9792021..59db8d3 100644 |
| 46 |
--- a/iw/makeconf_gui.py |
| 47 |
+++ b/iw/makeconf_gui.py |
| 48 |
@@ -35,12 +35,6 @@ _ = lambda x: gettext.ldgettext("anaconda", x) |
| 49 |
|
| 50 |
class MakeconfWindow(InstallWindow): |
| 51 |
def getNext(self): |
| 52 |
- self.anaconda.makeconf.march = self.march.get_active_text() |
| 53 |
- self.anaconda.makeconf.opt = self.opt.get_active_text() |
| 54 |
- self.anaconda.makeconf.pipe = self.pipe.get_active() |
| 55 |
- self.anaconda.makeconf.jobs = self.jobs.get_value_as_int() |
| 56 |
- self.anaconda.makeconf.load = self.load.get_value_as_int() |
| 57 |
- self.anaconda.makeconf.silent = self.silent.get_active() |
| 58 |
return None |
| 59 |
|
| 60 |
def getScreen(self, anaconda): |
Archives