[gentoo-commits] proj/gentoolkit:gentoolkit-dev commit in: src/ekeyword/

[Mike Frysinger]

commit:     56cf23ea1bd90f9f850691dbf2052cd58aa99a98
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  4 21:23:44 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Apr  4 21:23:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=56cf23ea

ekeyword: fix crash when passing "" as the arch

 src/ekeyword/ekeyword.py          | 2 +-
 src/ekeyword/ekeyword_unittest.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ekeyword/ekeyword.py b/src/ekeyword/ekeyword.py
index b0035da..7a0cc7d 100755
--- a/src/ekeyword/ekeyword.py
+++ b/src/ekeyword/ekeyword.py
@@ -478,7 +478,7 @@ def main(argv):
                        if arg in ('--format',):
                                if argv:
                                        parse_args.append(argv.pop(0))
-               elif arg[0] == '-' and len(arg) == 2:
+               elif len(arg) == 2 and arg[0] == '-':
                        parse_args.append(arg)
                else:
                        work_args.append(arg)

diff --git a/src/ekeyword/ekeyword_unittest.py 
b/src/ekeyword/ekeyword_unittest.py
index 5141159..134dd80 100755
--- a/src/ekeyword/ekeyword_unittest.py
+++ b/src/ekeyword/ekeyword_unittest.py
@@ -372,6 +372,10 @@ class TestMain(unittest.TestCase):
                ekeyword.main(['arm', '--dry-run', os.path.join(TESTDIR, 
'process-1.ebuild')])
                ekeyword.main(['--version', '--dry-run'])
 
+       def testEmptyString(self):
+               self.assertRaises(SystemExit, ekeyword.main,
+                                 ['', os.path.join(TESTDIR, 
'process-1.ebuild')])
+
 
 if __name__ == '__main__':
        unittest.main()