[gentoo-commits] gentoolkit r843 - in trunk/gentoolkit: bin pym/gentoolkit/equery pym/gentoolkit/eshowkw

[Tomas Chvatal (scarabeus)]

Author: scarabeus
Date: 2010-11-02 14:05:00 +0000 (Tue, 02 Nov 2010)
New Revision: 843

Modified:
   trunk/gentoolkit/bin/eshowkw
   trunk/gentoolkit/pym/gentoolkit/equery/keywords.py
   trunk/gentoolkit/pym/gentoolkit/eshowkw/__init__.py
   trunk/gentoolkit/pym/gentoolkit/eshowkw/keywords_content.py
Log:
Fix arg parsing everywhere for eshowkw.

Modified: trunk/gentoolkit/bin/eshowkw
===================================================================
--- trunk/gentoolkit/bin/eshowkw	2010-11-02 13:53:19 UTC (rev 842)
+++ trunk/gentoolkit/bin/eshowkw	2010-11-02 14:05:00 UTC (rev 843)
@@ -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:])

Modified: trunk/gentoolkit/pym/gentoolkit/equery/keywords.py
===================================================================
--- trunk/gentoolkit/pym/gentoolkit/equery/keywords.py	2010-11-02 13:53:19 UTC (rev 842)
+++ trunk/gentoolkit/pym/gentoolkit/equery/keywords.py	2010-11-02 14:05:00 UTC (rev 843)
@@ -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

Modified: trunk/gentoolkit/pym/gentoolkit/eshowkw/__init__.py
===================================================================
--- trunk/gentoolkit/pym/gentoolkit/eshowkw/__init__.py	2010-11-02 13:53:19 UTC (rev 842)
+++ trunk/gentoolkit/pym/gentoolkit/eshowkw/__init__.py	2010-11-02 14:05:00 UTC (rev 843)
@@ -75,7 +75,7 @@
 	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 @@
 	return 0
 
 if __name__ == '__main__':
-	sys.exit(main(sys.argv))
+	sys.exit(main(sys.argv[1:]))

Modified: trunk/gentoolkit/pym/gentoolkit/eshowkw/keywords_content.py
===================================================================
--- trunk/gentoolkit/pym/gentoolkit/eshowkw/keywords_content.py	2010-11-02 13:53:19 UTC (rev 842)
+++ trunk/gentoolkit/pym/gentoolkit/eshowkw/keywords_content.py	2010-11-02 14:05:00 UTC (rev 843)
@@ -155,7 +155,11 @@
 	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