Fix arg parsing everywhere for eshowkw.

svn path=/trunk/gentoolkit/; revision=843

diff --git a/bin/eshowkw b/bin/eshowkw
index df287a5f63493ffef04450b574dfbfb3f8ec4dc1..a64aa96813deaf9be5d4b6394e3d44b11516269e 100644 (file)
--- a/bin/eshowkw
+++ b/bin/eshowkw
@@ -3,7 +3,6 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-import sys
 from gentoolkit.eshowkw import main as emain
 
-emain(sys.argv)
+emain(args[1:])

diff --git a/pym/gentoolkit/equery/keywords.py b/pym/gentoolkit/equery/keywords.py
index d91a053f3505f95bb4e184ec9b8fad6c9fe6ddd0..cab49a7632e0738b57adc3d05d992f9df65e00d1 100644 (file)
--- a/pym/gentoolkit/equery/keywords.py
+++ b/pym/gentoolkit/equery/keywords.py
@@ -5,6 +5,5 @@
 import sys
 from gentoolkit.eshowkw import main as emain
 
-# we have equery as first argument instead of the scriptname
-# so we will just ommit it
-emain(sys.argv)
+def main(input_args):
+       args.extend(input_args)
\ No newline at end of file

diff --git a/pym/gentoolkit/eshowkw/__init__.py b/pym/gentoolkit/eshowkw/__init__.py
index 39da0521266477dc69705e16dbb2f920abb85ad0..0ea49734c616e88387b5e6352c159cf4f7ae1b16 100644 (file)
--- a/pym/gentoolkit/eshowkw/__init__.py
+++ b/pym/gentoolkit/eshowkw/__init__.py
@@ -75,7 +75,7 @@ def process_args(argv):
        parser.add_argument('-S', '--ignore-slot', action='store_true', default=False,
                help='Treat slots as irelevant during detection of redundant pacakges.')
 
-       return parser.parse_args(args=argv[1:])
+       return parser.parse_args(args=argv)
 
 def main(argv):
        global ignore_slots, bold, order, topper
@@ -129,4 +129,4 @@ def main(argv):
        return 0
 
 if __name__ == '__main__':
-       sys.exit(main(sys.argv))
+       sys.exit(main(sys.argv[1:]))

diff --git a/pym/gentoolkit/eshowkw/keywords_content.py b/pym/gentoolkit/eshowkw/keywords_content.py
index 7f820268b074f854fe6cc22d5920e1afe777f8ca..235d8a702022f4cebaba4c25a9ee8badc4e2b1c1 100644 (file)
--- a/pym/gentoolkit/eshowkw/keywords_content.py
+++ b/pym/gentoolkit/eshowkw/keywords_content.py
@@ -155,7 +155,11 @@ class keywords_content:
        def __checkExist(self, pdb, package):
                """Check if specified package even exists."""
                try:
-                       matches = pdb.xmatch('match-all', package)
+                       cp = port.dep_expand(package, mydb=pdb, settings=pdb.settings).cp
+                       matches = []
+                       for repo in pdb.porttrees:
+                               for cpv in pdb.cp_list(mycp=cp,mytree=[repo]):
+                                       matches.append((cpv, repo))
                except port.exception.AmbiguousPackageName as Arg:
                        msg_err = 'Ambiguous package name "%s".\n' % package
                        found = 'Possibilities: %s' % Arg