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

[Tomas Chvatal (scarabeus)]

Author: scarabeus
Date: 2010-10-28 21:31:47 +0000 (Thu, 28 Oct 2010)
New Revision: 838

Modified:
   trunk/gentoolkit/pym/gentoolkit/equery/keywords.py
   trunk/gentoolkit/pym/gentoolkit/eshowkw/__init__.py
Log:
Fix import path again. Process only proper passed args in required function.

Modified: trunk/gentoolkit/pym/gentoolkit/equery/keywords.py
===================================================================
--- trunk/gentoolkit/pym/gentoolkit/equery/keywords.py	2010-10-28 21:18:06 UTC (rev 837)
+++ trunk/gentoolkit/pym/gentoolkit/equery/keywords.py	2010-10-28 21:31:47 UTC (rev 838)
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 import sys
-from ...gentoolkit.eshowkw import main as emain
+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)

Modified: trunk/gentoolkit/pym/gentoolkit/eshowkw/__init__.py
===================================================================
--- trunk/gentoolkit/pym/gentoolkit/eshowkw/__init__.py	2010-10-28 21:18:06 UTC (rev 837)
+++ trunk/gentoolkit/pym/gentoolkit/eshowkw/__init__.py	2010-10-28 21:31:47 UTC (rev 838)
@@ -79,6 +79,10 @@
 def main(argv):
 	global ignore_slots, bold, order, topper
 
+	# equery support
+	if argv[0] = 'equery':
+		pkgsearch_only = True
+
 	#opts parsing
 	opts = process_args(argv)
 	ignore_slots = opts.ignore_slot
@@ -93,6 +97,12 @@
 	prefix = opts.prefix
 	color = opts.color
 	package = opts.package
+
+	# equery support
+	if pkgsearch_only and len(package) <= 0:
+		msg_err = 'No packages specified'
+		raise SystemExit(msg_err)
+
 	# disable colors when redirected and they are not forced on
 	if not color and not sys.stdout.isatty():
 		# disable colors