Fix import path again. Process only proper passed args in required function.

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

diff --git a/pym/gentoolkit/equery/keywords.py b/pym/gentoolkit/equery/keywords.py
index f8765102b32e31f2ac6956c3526d8409e7bb3a7d..e9ec5eb28eec4f8e71b5640dbfe559cf34533a54 100644 (file)
--- a/pym/gentoolkit/equery/keywords.py
+++ b/pym/gentoolkit/equery/keywords.py
@@ -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)

diff --git a/pym/gentoolkit/eshowkw/__init__.py b/pym/gentoolkit/eshowkw/__init__.py
index 672996cc057b34f315124ec7e23b5b806ff364ba..a6f1ff490d5ac93c5fe27b6643d2924abac10832 100644 (file)
--- a/pym/gentoolkit/eshowkw/__init__.py
+++ b/pym/gentoolkit/eshowkw/__init__.py
@@ -79,6 +79,10 @@ def process_args(argv):
 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 @@ def main(argv):
        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