[kernel] r5913 - in people/waldi: linux-2.6/debian/bin linux-2.6/debian/lib/python/debian_linux/kconfigeditor utils utils/kconfigeditor utils/kconfigeditor/kconfigeditor

[Bastian Blank]

Author: waldi
Date: Fri Feb 17 15:46:53 2006
New Revision: 5913

Added:
   people/waldi/utils/
   people/waldi/utils/kconfigeditor/
   people/waldi/utils/kconfigeditor/kconfigeditor/
      - copied from r5703, people/waldi/linux-2.6/debian/lib/python/debian_linux/kconfigeditor/
   people/waldi/utils/kconfigeditor/kconfigeditor.py
      - copied, changed from r5703, people/waldi/linux-2.6/debian/bin/kconfigeditor.py
Removed:
   people/waldi/linux-2.6/debian/bin/kconfigeditor.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/kconfigeditor/
Modified:
   people/waldi/utils/kconfigeditor/kconfigeditor/editor.py
Log:
* /people/waldi/utils, /people/waldi/utils/kconfigeditor: New directory.
* /people/waldi/utils/kconfigeditor/kconfigeditor:
  Move from /people/waldi/linux-2.6/debian/lib/python/debian_linux/kconfigeditor.
* /people/waldi/utils/kconfigeditor/kconfigeditor/editor.py: Fix.
* /people/waldi/utils/kconfigeditor/kconfigeditor.py
  - Move from /people/waldi/linux-2.6/debian/bin/kconfigeditor.py.
  - Fix.


Copied: people/waldi/utils/kconfigeditor/kconfigeditor.py (from r5703, people/waldi/linux-2.6/debian/bin/kconfigeditor.py)
==============================================================================
--- people/waldi/linux-2.6/debian/bin/kconfigeditor.py	(original)
+++ people/waldi/utils/kconfigeditor/kconfigeditor.py	Fri Feb 17 15:46:53 2006
@@ -1,39 +1,41 @@
 #!/usr/bin/env python2.4
 import sys
-sys.path.append("debian/lib/python")
+# HACK
+sys.path.append("../../linux-2.6/debian/lib/python")
 from debian_linux.config import config_reader
-from debian_linux.kconfigeditor.editor import editor
+from kconfigeditor.editor import editor
 
 import pygtk
+pygtk.require("2.0")
 import gtk
 
 class editor(editor):
-    def __init__(self):
+    def __init__(self, base):
         super(editor, self).__init__()
 
-        self.config = config_reader()
+        self.config = config_reader(base)
 
-        self.add_file("debian/arch/config")
+        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("debian/arch/%s/config" % arch, 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("debian/arch/%s/%s/config" % (arch, subarch), arch, subarch)
+                    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("debian/arch/%s/config.%s" % (arch, flavour), arch, subarch, flavour)
+                        self.add_file("%s/%s/config.%s" % (base, arch, flavour), arch, subarch, flavour)
                     else:
-                        self.add_file("debian/arch/%s/%s/config.%s" % (arch, subarch, flavour), arch, subarch, flavour)
+                        self.add_file("%s/%s/%s/config.%s" % (base, arch, subarch, flavour), arch, subarch, flavour)
 
         self.show()
 
 if __name__ == '__main__':
-    editor()
+    editor("../../linux-2.6/debian/arch")
     gtk.main()

Modified: people/waldi/utils/kconfigeditor/kconfigeditor/editor.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/kconfigeditor/editor.py	(original)
+++ people/waldi/utils/kconfigeditor/kconfigeditor/editor.py	Fri Feb 17 15:46:53 2006
@@ -2,6 +2,7 @@
 from debian_linux.utils import sorted_dict
 
 import pygtk
+pygtk.require("2.0")
 import gtk
 
 _marker = object()