[kernel-team] 86/86: kconfigeditor2: Fix processing of 'source' inside 'choice'

[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 78a7f6088c8d80dc7a5988bcf251738d6e531bc6
Author: Ben Hutchings <benh at debian.org>
Date:   Tue Aug 11 15:41:19 2015 +0000

    kconfigeditor2: Fix processing of 'source' inside 'choice'
    
    Currently kconfigeditor.kconfig.menu.all.All assumes the parser will put
    all MenuEntrySource elements directly under the parse root.  However,
    they may also be placed under a MenuEntryChoice.  There is one instance
    where this occurs in current linux sources, in
    drivers/usb/gadget/Kconfig.
    
    Handle this special case when parsing MenuEntryChoice.
    
    svn path=/people/waldi/utils/kconfigeditor2/; revision=22941
---
 utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py b/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
index ce727b0..795e44a 100644
--- a/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
+++ b/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
@@ -182,6 +182,7 @@ class _BlockChoice(_BlockObject, _BlockContainerCommon):
         super(_BlockChoice, self).__init__(parent)
         self.entry = MenuEntryChoice()
         parent.entry.append(self.entry)
+        self._parent = parent
         _BlockConfigData(self, self.entry)
 
     def process_default(self, text, ind):
@@ -190,6 +191,10 @@ class _BlockChoice(_BlockObject, _BlockContainerCommon):
     def process_endchoice(self, text, ind):
         self.pop()
 
+    def process_source(self, text, ind):
+        # Push source statements up to the parent
+        self._parent.process_source(text, ind)
+
 class _BlockComment(_BlockObject, _BlockContainerDepends):
     pass
 

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