From: Benjamin Drung <benjamin.drung@profitbricks.com>
Date: Fri, 3 Jan 2014 17:10:46 +0000 (+0100)
Subject: Only pass --override-config to pbuilder on sqeeze (for now).
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=1c1ce75080effe12800dd7d5ea91b39fe4692610;p=profitbricks%2Fjenkins-build-scripts.git

Only pass --override-config to pbuilder on sqeeze (for now).
---

diff --git a/lib/pbuilder.py b/lib/pbuilder.py
index 70fa87d..86945c0 100644
--- a/lib/pbuilder.py
+++ b/lib/pbuilder.py
@@ -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):