[kernel-team] 83/86: show-enabled.py: Make it possible to ignore top-level disabled options.

[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 0646d6c04e7dac44852482d40c70f89eb6f54ea9
Author: Bastian Blank <waldi at debian.org>
Date:   Sat Sep 21 16:44:43 2013 +0000

    show-enabled.py: Make it possible to ignore top-level disabled options.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=20658
---
 utils/kconfigeditor2/show-enabled.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/utils/kconfigeditor2/show-enabled.py b/utils/kconfigeditor2/show-enabled.py
index f7a3149..f123985 100755
--- a/utils/kconfigeditor2/show-enabled.py
+++ b/utils/kconfigeditor2/show-enabled.py
@@ -12,12 +12,12 @@ class Option(object):
         self.values = {}
 
     def add(self, value, filename):
-        v = self.values.setdefault(value, [])
-        v.append(filename)
+        v = self.values.setdefault(value, set())
+        v.add(filename)
 
 
 class Main(object):
-    def __init__(self, package):
+    def __init__(self, package, ignore_top_disabled=False):
         from kconfigeditor.package import Package
 
         package = Package(package)
@@ -36,9 +36,14 @@ class Main(object):
 
         for name, option in sorted(options.items()):
             if len(option.values) > 1:
-                for value, filenames in option.values.items():
+                for entry, filenames in option.values.items():
+                    if (ignore_top_disabled and
+                        not entry.value and
+                        filenames == frozenset(('config', ))):
+                        continue
+
                     print(' '.join(sorted(filenames, key=filenames_sortkey)))
-                    print('  ', value)
+                    print('  ', entry)
                 print()
 
 
@@ -46,11 +51,12 @@ if __name__ == '__main__':
     options = optparse.OptionParser(
         usage = "%prog [OPTION]... PACKAGE"
     )
+    options.add_option('--ignore-top-disabled', action='store_true')
 
     opts, args = options.parse_args()
 
     if len(args) != 1:
         options.error("Too less arguments")
 
-    Main(*args)
+    Main(*args, ignore_top_disabled=opts.ignore_top_disabled)
 

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