]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
Only pass --override-config to pbuilder on sqeeze (for now).
authorBenjamin Drung <benjamin.drung@profitbricks.com>
Fri, 3 Jan 2014 17:10:46 +0000 (18:10 +0100)
committerBenjamin Drung <benjamin.drung@profitbricks.com>
Fri, 3 Jan 2014 17:10:46 +0000 (18:10 +0100)
lib/pbuilder.py

index 70fa87d28a514bf1895084637d2baf830f6829be..86945c020d02fb45162d057f18a84baf51674d1e 100644 (file)
@@ -51,11 +51,14 @@ class Pbuilder(object):
                 BIN_PBUILDER,
                 '--build',
                 '--buildresult', '../build-area/result/',
-                '--override-config',
                 '--debbuildopts', '-b',   # don't build source packages...
                                           # see directly below
-                self.dsc_file,
         ]
+        # FIXME: Fix .pbuilderrc to also generate correct sources list on
+        # wheezy and then always use --override-config.
+        if self.dist == "squeeze":
+            result.append('--override-config')
+        result.append(self.dsc_file)
         return result
 
     def build(self):