[jhbuild/pre-3-cleanup: 4/16] flake8: don't exclude the linux modtype



commit 4cf5e92ff44c6680a439dac1599c0afdca7a83e5
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sat Sep 21 22:05:29 2019 +0200

    flake8: don't exclude the linux modtype
    
    It looked like it was just broken which is why I skipped it, but might be
    that it works with the right xml, so just change enough to make flake8 happy.

 .flake8                   | 3 +--
 jhbuild/modtypes/linux.py | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/.flake8 b/.flake8
index ea2450cd..30c493f2 100644
--- a/.flake8
+++ b/.flake8
@@ -1,5 +1,4 @@
 [flake8]
 
ignore=E122,E402,E126,E128,E401,W504,W503,E201,E302,E305,E251,E203,E124,E231,W293,E261,E221,E211,E502,E722,W391,E301,E202,E225,E227,W291,E303,E226,E131,E123,E241,W292
 max-line-length=160
-builtins=SRCDIR,_,N_,PKGDATADIR,DATADIR
-exclude=jhbuild/modtypes/linux.py
\ No newline at end of file
+builtins=SRCDIR,_,N_,PKGDATADIR,DATADIR
\ No newline at end of file
diff --git a/jhbuild/modtypes/linux.py b/jhbuild/modtypes/linux.py
index 6b7be6f6..c9247c57 100644
--- a/jhbuild/modtypes/linux.py
+++ b/jhbuild/modtypes/linux.py
@@ -26,7 +26,7 @@ import errno
 
 from jhbuild.errors import FatalError, BuildStateError
 from jhbuild.modtypes import \
-     register_module_type, MakeModule
+     register_module_type, MakeModule, get_branch
 
 __all__ = [ 'LinuxModule' ]
 
@@ -227,6 +227,7 @@ def get_kconfigs(node, repositories, default_repo):
     id = node.getAttribute('id')
 
     kconfigs = []
+    kconfig = None
 
     for childnode in node.childNodes:
         if childnode.nodeType != childnode.ELEMENT_NODE or childnode.nodeName != 'kconfig':
@@ -238,7 +239,7 @@ def get_kconfigs(node, repositories, default_repo):
                 repo = repositories[repo_name]
             except KeyError:
                 raise FatalError(_('Repository=%(missing)s not found for kconfig in linux id=%(linux_id)s. 
Possible repositories are %(possible)s'
-                                    % {'missing': repo_name, 'linux_id': id, 'possible': repositories}))
+                                   % {'missing': repo_name, 'linux_id': id, 'possible': repositories}))
         else:
             try:
                 repo = repositories[default_repo]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]