[pitivi] build: Run the right Pitivi branch when specified by the user



commit 8b4b2887db55b4024de54f2acec21de73203de33
Author: Thibault Saunier <tsaunier gnome org>
Date:   Fri Aug 19 09:21:17 2016 -0700

    build: Run the right Pitivi branch when specified by the user
    
    + Do not move to pitivi root folder when getting inside the sandbox,
      there is not reason to do that.

 build/flatpak/enter-env      |    1 -
 build/flatpak/pitivi-flatpak |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/build/flatpak/enter-env b/build/flatpak/enter-env
index d8d7a8d..07f6006 100755
--- a/build/flatpak/enter-env
+++ b/build/flatpak/enter-env
@@ -18,5 +18,4 @@ echo "=============================="
 echo "Entering own built environment"
 echo "=============================="
 
-cd $PITIVI_DIR
 bash --rcfile $RCFILE
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index d8c308c..d4df9a4 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -299,7 +299,7 @@ class FlatpakPackage(FlatpakObject):
 
         self.flatpak("run", "--branch=" + self.branch, self.name, *args,
                      show_output=True,
-                     comment="Running %s" % self.name)
+                     comment="Running %s (%s)" % (self.name, self.branch))
 
 
 class PitiviFlatpak:  # pylint: disable=too-many-instance-attributes
@@ -390,7 +390,7 @@ class PitiviFlatpak:  # pylint: disable=too-many-instance-attributes
         self.sdk = FlatpakPackage(
             "org.gnome.Sdk", SDK_BRANCH, self.sdk_repo, "x86_64")
         self.app = FlatpakPackage(
-            "org.pitivi.Pitivi", PITIVI_BRANCH, self.app_repo, "x86_64")
+            "org.pitivi.Pitivi", self.branch, self.app_repo, "x86_64")
         self.packs = [self.runtime, self.locale]
 
         self.args = args


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]