equery: turn sys.argv into a parameter

This lets other tools import equery and call the main func with its own
set of flags.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Paul Varner <fuzzyray@gentoo.org>

diff --git a/bin/equery b/bin/equery
index 343f92da776b11ba2716ea48f82a43d9fa1e475d..35e9d7d5bbefff1bfd8e29b414569f08438e964c 100755 (executable)
--- a/bin/equery
+++ b/bin/equery
@@ -35,7 +35,7 @@ except KeyboardInterrupt:
 from gentoolkit import equery, errors
 
 try:
-       equery.main()
+       equery.main(sys.argv)
 except errors.GentoolkitNonZeroExit as err:
        sys.exit(err.return_code)
 except errors.GentoolkitException as err:

diff --git a/pym/gentoolkit/equery/__init__.py b/pym/gentoolkit/equery/__init__.py
index 9e8834be74e936f708881298113ef0342b67e149..a73ef1ba5e07aa45504a28f465d02342ab37bcdf 100644 (file)
--- a/pym/gentoolkit/equery/__init__.py
+++ b/pym/gentoolkit/equery/__init__.py
@@ -305,7 +305,7 @@ def split_arguments(args):
        return args.pop(0), args
 
 
-def main():
+def main(argv):
        """Parse input and run the program."""
 
        short_opts = "hqCNV"
@@ -316,7 +316,7 @@ def main():
        initialize_configuration()
 
        try:
-               global_opts, args = getopt(sys.argv[1:], short_opts, long_opts)
+               global_opts, args = getopt(argv[1:], short_opts, long_opts)
        except GetoptError as err:
                sys.stderr.write(pp.error("Global %s" % err))
                print_help(with_description=False)
@@ -359,4 +359,4 @@ def main():
                        raise
 
 if __name__ == '__main__':
-       main()
+       main(sys.argv)