Merge lp:~laney/sessioninstaller/gst-1.6-compat into lp:sessioninstaller

[Iain Lane]

gst 1.6 calls gst with some additional parameters (--interaction --desktop-id --startup-notification-id) which we don't know about and were erroring out on.

They are part of the "Modify2" packagekit API which sessioninstaller doesn't know about (in common with most other implementations it seems) - just ignore them for now, but don't crash.

Unmerged revisions

151. By Iain Lane on 2015-09-28

Don't break with the way new gstramer calls gst-install.

New gstreamer codec install API passes the parameters --interaction
--desktop-id and -startup-notification-id to us. We don 't support them (yet),
and should not error out but should ignore them instead. They are part of a new
PackageKit API.

=== modified file 'sessioninstaller/gstinstaller.py'
--- sessioninstaller/gstinstaller.py	2015-08-09 10:10:34 +0000
+++ sessioninstaller/gstinstaller.py	2015-09-28 12:48:25 +0000
@@ -19,9 +19,9 @@
 
 __author__  = "Sebastian Heinlein <[e-mail]>"
 
+import argparse
 from gettext import gettext as _
 import logging
-import optparse
 import re
 import sys
 
@@ -84,12 +84,20 @@
 
 
 def main():
-    parser = optparse.OptionParser()
-    parser.add_option("", "--transient-for", action="store", type="int",
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--transient-for", action="store", type=int,
                       dest="xid", default="0",
                       help=_("The X Window ID of the calling application"))
-    options, args = parser.parse_args()
-    installer = GStreamerInstaller(options.xid, args)
+    parser.add_argument("--interaction", type=str, dest="interaction", default="show-confirm-search",
+                      help=_("Whether to ask the user to confirm installation or not (currently ignored)"))
+    parser.add_argument("--desktop-id", type=str, dest="desktop_id", default=None,
+                      help=_("The .desktop file of the calling application (currently ignored)"))
+    parser.add_argument("--startup-notification-id", type=str,
+                      dest="startup_notification_id", default=None,
+                      help=_("An X11-style startup notification ID"))
+    parser.add_argument("codec", nargs="+", help=_("The codec to install (currently ignored)"))
+    options = parser.parse_args()
+    installer = GStreamerInstaller(options.xid, options.codec)
     # See the documentation of gstpbutilsinstallplugins for the exit state
     # definitions. Unluckily the PackageKit session interface doesn't support
     # partial codec installation