[kernel] r6019 - in people/waldi/utils/kconfigeditor: . kconfigeditor

[Bastian Blank]

Author: waldi
Date: Thu Mar  2 13:56:20 2006
New Revision: 6019

Modified:
   people/waldi/utils/kconfigeditor/kconfigeditor.py
   people/waldi/utils/kconfigeditor/kconfigeditor/editor.py
Log:
* kconfigeditor/editor.py
  - Add complete config code.
  - Adopt config updates.
* kconfigeditor.py: Accept directory as first command.



Modified: people/waldi/utils/kconfigeditor/kconfigeditor.py
==============================================================================
--- people/waldi/utils/kconfigeditor/kconfigeditor.py	(original)
+++ people/waldi/utils/kconfigeditor/kconfigeditor.py	Thu Mar  2 13:56:20 2006
@@ -1,41 +1,15 @@
 #!/usr/bin/env python2.4
 import os, sys
-# HACK
-sys.path.append(os.getcwd() + "/debian/lib/python")
-from debian_linux.config import config_reader
-from kconfigeditor.editor import editor
 
 import pygtk
 pygtk.require("2.0")
 import gtk
 
-class editor(editor):
-    def __init__(self, base):
-        super(editor, self).__init__()
-
-        self.config = config_reader(base)
-
-        self.add_file("%s/config" % base)
-        for arch in iter(self.config['base',]['arches']):
-            if self.config['base', arch].get("available", "yes") != "yes":
-                continue
-            self.add_data(arch)
-            self.add_file("%s/%s/config" % (base, arch), arch)
-            for subarch in iter(self.config['base', arch]['subarches']):
-                self.add_data(arch, subarch)
-                if subarch != "none":
-                    self.add_file("%s/%s/%s/config" % (base, arch, subarch), arch, subarch)
-                else:
-                    self.add_file(None, arch, subarch)
-                for flavour in iter(self.config['base', arch, subarch]['flavours']):
-                    self.add_data(arch, subarch, flavour)
-                    if subarch == "none":
-                        self.add_file("%s/%s/config.%s" % (base, arch, flavour), arch, subarch, flavour)
-                    else:
-                        self.add_file("%s/%s/%s/config.%s" % (base, arch, subarch, flavour), arch, subarch, flavour)
-
-        self.show()
-
 if __name__ == '__main__':
-    editor("debian/arch")
+    dir = sys.argv[1]
+    sys.path.append(dir + "/debian/lib/python")
+    from kconfigeditor.editor import editor
+    e = editor()
+    e.add(dir + "/debian/arch")
+    e.show()
     gtk.main()

Modified: people/waldi/utils/kconfigeditor/kconfigeditor/editor.py
==============================================================================
--- people/waldi/utils/kconfigeditor/kconfigeditor/editor.py	(original)
+++ people/waldi/utils/kconfigeditor/kconfigeditor/editor.py	Thu Mar  2 13:56:20 2006
@@ -1,4 +1,5 @@
 from file import kconfigfile
+from debian_linux.config import config_reader
 from debian_linux.utils import sorted_dict
 
 import pygtk
@@ -106,6 +107,28 @@
         col.set_cell_data_func(cell, self.cell_data, (None, None, None))
         self.columns[None] = col
 
+    def add(self, base):
+        self.config = config_reader([base])
+
+        self.add_file("%s/config" % base)
+        for arch in iter(self.config['base',]['arches']):
+            if self.config['base', arch].get("available", "yes") != "yes":
+                continue
+            self.add_data(arch)
+            self.add_file("%s/%s/config" % (base, arch), arch)
+            for subarch in iter(self.config['base', arch]['subarches']):
+                self.add_data(arch, subarch)
+                if subarch != "none":
+                    self.add_file("%s/%s/%s/config" % (base, arch, subarch), arch, subarch)
+                else:
+                    self.add_file(None, arch, subarch)
+                for flavour in iter(self.config['base', arch, subarch]['flavours']):
+                    self.add_data(arch, subarch, flavour)
+                    if subarch == "none":
+                        self.add_file("%s/%s/config.%s" % (base, arch, flavour), arch, subarch, flavour)
+                    else:
+                        self.add_file("%s/%s/%s/config.%s" % (base, arch, subarch, flavour), arch, subarch, flavour)
+
     def add_data(self, arch, subarch = None, flavour = None):
         if not self.variants.has_key(arch):
             col = gtk.TreeViewColumn(arch)