Changeset f951077 in mainline

Timestamp:

2006-06-07T17:46:32Z (18 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b2951e2

Parents:

ce5bcb4

Message:

Fixed config with bad dialog.

File:

• tools/config.py (modified) (8 diffs)

tools/config.py

@@ -1 +1 @@
 #!/usr/bin/env python
 """
-user space configuration script
+Kernel configuration script
 """
 import sys
@@ -8 +8 @@
 import commands
 
-INPUT = 'uspace.config'
+INPUT = 'kernel.config'
 OUTPUT = 'Makefile.config'
 TMPOUTPUT = 'Makefile.config.tmp'
@@ -109 +109 @@
 
 
+def eof_checker(fnc):
+    def wrapper(self, *args, **kw):
+        try:
+            return fnc(self, *args, **kw)
+        except EOFError:
+            return getattr(self.bckdialog,fnc.func_name)(*args, **kw)
+    return wrapper
+
 class Dialog(NoDialog):
     def __init__(self):
@@ -114 +122 @@
         self.dlgcmd = os.environ.get('DIALOG','dialog')
         self.title = ''
-        self.backtitle = 'HelenOS User Space Configuration'
+        self.backtitle = 'HelenOS Kernel Configuration'
         
         if os.system('%s --print-maxsize >/dev/null 2>&1' % self.dlgcmd) != 0:
             raise NotImplementedError
+        
+        self.bckdialog = NoDialog()
 
     def set_title(self,text):
         self.title = text
+        self.bckdialog.set_title(text)
         
     def calldlg(self,*args,**kw):
@@ -177 +188 @@
             return 'y'
         return 'n'
+    yesno = eof_checker(yesno)
 
     def menu(self, text, choices, button, defopt=None):
@@ -204 +216 @@
             raise EOFError
         return data
+    menu = eof_checker(menu)
     
     def choice(self, text, choices, defopt=None):
@@ -223 +236 @@
             raise EOFError
         return data
+    choice = eof_checker(choice)
     
 def read_defaults(fname,defaults):
@@ -474 +488 @@
     os.rename(TMPOUTPUT, OUTPUT)
     
-    if not defmode and dlg.yesno('Rebuild user space?') == 'y':
+    if not defmode and dlg.yesno('Rebuild kernel?') == 'y':
         os.execlp('make','make','clean','build')