Make flatpak_state_dir optional.
authorCarl Hetherington <cth@carlh.net>
Thu, 26 Jul 2018 14:58:38 +0000 (15:58 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 26 Jul 2018 14:58:38 +0000 (15:58 +0100)
cdist

diff --git a/cdist b/cdist
index 4906b09f0101aea2034c421c1fc4a869bcd59e81..4540923eb33666292ce55047c4efad380c7d22f2 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -126,6 +126,12 @@ class Config:
         except:
             raise
 
+    def has(self, k):
+        for o in self.options:
+            if o.key == k:
+                return True
+        return False
+
     def get(self, k):
         for o in self.options:
             if o.key == k:
@@ -526,7 +532,10 @@ class FlatpakTarget(Target):
         return 'flatpak'
 
     def flatpak_builder(self):
-        return 'flatpak-builder --state-dir=%s' % config.get('flatpak_state_dir')
+        b = 'flatpak-builder'
+        if config.has('flatpak_state_dir'):
+            b += ' --state-dir=%s' % config.get('flatpak_state_dir')
+        return b
 
 
 class WindowsTarget(DockerTarget):