[kernel-team] 62/86: lib/kconfigeditor/package.py: Update.

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch benh/kconfigeditor2
in repository kernel-team.

commit 10fb21e66a4fee103b309e27182e9a96164b4bd1
Author: Bastian Blank <waldi at debian.org>
Date:   Fri Dec 4 17:02:22 2009 +0000

    lib/kconfigeditor/package.py: Update.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=14725
---
 utils/kconfigeditor2/lib/kconfigeditor/package.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/utils/kconfigeditor2/lib/kconfigeditor/package.py b/utils/kconfigeditor2/lib/kconfigeditor/package.py
index c2b4a44..f296a00 100644
--- a/utils/kconfigeditor2/lib/kconfigeditor/package.py
+++ b/utils/kconfigeditor2/lib/kconfigeditor/package.py
@@ -8,12 +8,18 @@ from .kconfig.config import File
 
 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 @@ class Package(object):
 
         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 @@ class Package(object):
         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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/kernel-team.git