[kernel] r14725 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor

[Bastian Blank]

Author: waldi
Date: Fri Dec  4 17:02:22 2009
New Revision: 14725

Log:
lib/kconfigeditor/package.py: Update.

Modified:
   people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py

Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py
==============================================================================
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py	Fri Dec  4 14:02:07 2009	(r14724)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/package.py	Fri Dec  4 17:02:22 2009	(r14725)
@@ -8,12 +8,18 @@
 
 class PackageFile(object):
     def __init__(self, key, kernelarch, file):
-        self.keys, self.kernelarch, self.file = [key], kernelarch, file
+        self.keys = set(key)
+        self.kernelarches = kernelarch and set((kernelarch,)) or set()
+        self.file = file
 
     def add(self, key, kernelarch):
-        self.keys.append(key)
-        if self.kernelarch != kernelarch:
-            self.kernelarch = None
+        self.keys.add(key)
+        self.kernelarches.add(kernelarch)
+
+    @property
+    def kernelarch(self):
+        if len(self.kernelarches) == 1:
+            return list(self.kernelarches)[0]
 
 
 class Package(object):
@@ -22,7 +28,6 @@
 
         data = imp.find_module('config', [os.path.join(root, 'debian', 'lib', 'python', 'debian_linux')])
         module = imp.load_module('config', *data)
-        print module
         self.config_root = os.path.join(root, "debian/config")
         self.config = module.ConfigCoreHierarchy([self.config_root])
 
@@ -118,10 +123,9 @@
         for i in self.files.iteritems():
             yield i
 
+    @property
     def kernelarches(self):
         ret = set()
         for data in self.files.itervalues():
-            kernelarch = data['kernelarch']
-            if kernelarch:
-                ret.add(kernelarch)
+            ret |= data.kernelarches
         return ret