sort packages subcommand and add option to show upstream name

1 files changed, 10 insertions, 5 deletions

diff --git a/mgagnome b/mgagnome
index e6cdd58..097e991 100755
--- a/mgagnome
+++ b/mgagnome
@@ -74,8 +74,6 @@ def judge_version_increase(version_old, version_new):
         5+: Ok"""
         versions = (version_old, version_new)
 
-        print " => ".join(versions)
-
         # First do a basic version comparison to ensure version_new is actually newer
         compare = version_cmp(version_new, version_old)
 
@@ -478,13 +476,18 @@ def cmd_co(options, parser):
         for package in downstream[module]:
             subprocess.call(['mgarepo', 'co', package], cwd=cwd)
 
-def cmd_ls(options, parser):
+def join_streams():
     upstream = get_upstream_names()
     downstream, downstream_files = get_downstream_names()
 
     matches = upstream & set(downstream.keys())
     for module in matches:
-        print "\n".join(sorted(downstream[module]))
+        for package in downstream[module]:
+            yield (package, module)
+
+def cmd_ls(options, parser):
+    for package, module in sorted(join_streams()):
+        print "\t".join((package, module)) if options.upstream else package
 
 def cmd_patches(options, parser):
     upstream = get_upstream_names()
@@ -572,8 +575,10 @@ def main():
     )
 
     subparser = subparsers.add_parser('packages', help='list all GNOME packages')
+    subparser.add_argument("-m", "--m", action="store_true", dest="upstream",
+                                       help="Show upstream module")
     subparser.set_defaults(
-        func=cmd_ls
+        func=cmd_ls, upstream=False
     )
 
     subparser = subparsers.add_parser('patches', help='list all GNOME patches')