[pitivi] flatpak: Fix arguments parsing

[Alexandru Băluț <alexbalut src gnome org>]

commit f11d37e11ac4e85a38dd96a7d7f44bb738fc6fc2
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Wed Nov 9 17:20:44 2016 +0100

    flatpak: Fix arguments parsing
    
    Fixes https://phabricator.freedesktop.org/T7594
    
    Reviewed-by: Thibault Saunier <tsaunier gnome org>
    Differential Revision: https://phabricator.freedesktop.org/D1468

 build/flatpak/pitivi-flatpak |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index 57d8c91..9d7896a 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -388,7 +388,7 @@ class PitiviFlatpak:  # pylint: disable=too-many-instance-attributes
 
         exit(exitcode)
 
-    def clean_args(self, args):
+    def clean_args(self):
         self.check_flatpak()
 
         repos = FlatpakRepos()
@@ -412,7 +412,6 @@ class PitiviFlatpak:  # pylint: disable=too-many-instance-attributes
             "org.pitivi.Pitivi", self.branch, self.app_repo, "x86_64")
         self.packs = [self.runtime, self.locale]
 
-        self.args = args
         if self.bundle:
             self.build = True
 
@@ -568,6 +567,8 @@ class PitiviFlatpak:  # pylint: disable=too-many-instance-attributes
             m.update()
 
 if __name__ == "__main__":
+    app_flatpak = PitiviFlatpak()
+
     parser = argparse.ArgumentParser(
         prog="pitivi-flatpak")
 
@@ -580,6 +581,11 @@ if __name__ == "__main__":
     general.add_argument("--installer", dest="installer",
                          action="store_true")
 
+    general.add_argument("args",
+                         nargs=argparse.REMAINDER,
+                         help="Arguments passed when starting %s or, if -d is "
+                              "passed, the command to run" % app_flatpak.name)
+
     devel = parser.add_argument_group("Development")
     devel.add_argument("-d", "--devel", dest="devel",
                        action="store_true",
@@ -618,7 +624,6 @@ if __name__ == "__main__":
         help="Generate static deltas (check 'man flatpak-build-update-repo'"
         " for more information)")
 
-    app_flatpak = PitiviFlatpak()
-    flatpak_args = parser.parse_known_args(namespace=app_flatpak)[1]
-    app_flatpak.clean_args(flatpak_args)
+    parser.parse_args(namespace=app_flatpak)
+    app_flatpak.clean_args()
     app_flatpak.run()