[gnome-software] trivial: Allow using flatpak from git master

[Richard Hughes <rhughes src gnome org>]

commit 2af1223050a450fb9a13c6e39d570b13180639b8
Author: Richard Hughes <richard hughsie com>
Date:   Tue Feb 21 17:59:16 2017 +0000

    trivial: Allow using flatpak from git master

 data/tests/flatpak/build.py |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/data/tests/flatpak/build.py b/data/tests/flatpak/build.py
index b29579e..7dced7f 100755
--- a/data/tests/flatpak/build.py
+++ b/data/tests/flatpak/build.py
@@ -10,7 +10,7 @@ def build_flatpak(appid, srcdir, repodir, cleanrepodir=True):
     # delete repodir
     if cleanrepodir and os.path.exists(repodir):
         print "Deleting %s" % repodir
-        #shutil.rmtree(repodir)
+        shutil.rmtree(repodir)
 
     # delete exportdir
     exportdir = os.path.join(srcdir, appid, 'export')
@@ -18,8 +18,15 @@ def build_flatpak(appid, srcdir, repodir, cleanrepodir=True):
         print "Deleting %s" % exportdir
         shutil.rmtree(exportdir)
 
+    # use git master where available
+    local_checkout = '/home/hughsie/Code/flatpak'
+    if os.path.exists(local_checkout):
+        flatpak_cmd = os.path.join(local_checkout, 'flatpak')
+    else:
+        flatpak_cmd = 'flatpak'
+
     # finish the build
-    argv = ['flatpak', 'build-finish']
+    argv = [flatpak_cmd, 'build-finish']
     argv.append(os.path.join(srcdir, appid))
     subprocess.call(argv)
 
@@ -33,7 +40,7 @@ def build_flatpak(appid, srcdir, repodir, cleanrepodir=True):
     subprocess.call(argv)
 
     # export into repo
-    argv = ['flatpak', 'build-export']
+    argv = [flatpak_cmd, 'build-export']
     argv.append(repodir)
     argv.append(os.path.join(srcdir, appid))
     argv.append('--update-appstream')