[pitivi] flatpak: Handle bundles installed from a Bundle file



commit 2b58d378bc199c9448c4886534afa6d90eaf7cf9
Author: Thibault Saunier <tsaunier gnome org>
Date:   Fri Sep 30 09:53:29 2016 -0300

    flatpak: Handle bundles installed from a Bundle file

 build/flatpak/pitivi-flatpak |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index 99f8430..3809f97 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -146,7 +146,9 @@ class FlatpakPackages(FlatpakObject):  # pylint: disable=too-few-public-methods
         for package_def in package_defs:
             splited_packaged_def = [p for p in package_def.split(" ") if p]
             name, arch, branch = splited_packaged_def[0].split("/")
-            repo = self.repos.repos[splited_packaged_def[1]]
+
+            # If installed from a file, the package is in no repo
+            repo = self.repos.repos.get(splited_packaged_def[1])
 
             packs.append(FlatpakPackage(name, branch, repo, arch))
 
@@ -272,6 +274,10 @@ class FlatpakPackage(FlatpakObject):
         return "%s/%s/%s %s" % (self.name, self.arch, self.branch, self.repo.name)
 
     def is_installed(self):
+        if not self.repo:
+            # Bundle installed from file
+            return True
+
         self.repo.repos.update()
         for package in self.repo.repos.packages:
             if package.name == self.name and \
@@ -282,6 +288,9 @@ class FlatpakPackage(FlatpakObject):
         return False
 
     def install(self):
+        if not self.repo:
+            return False
+
         self.flatpak("install", self.repo.name, self.name,
                      self.branch, show_output=True,
                      comment="Installing %s" % self.name)


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