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

This reverts commit 1c1ce75080effe12800dd7d5ea91b39fe4692610.

diff --git a/lib/pbuilder.py b/lib/pbuilder.py
index 86945c020d02fb45162d057f18a84baf51674d1e..70fa87d28a514bf1895084637d2baf830f6829be 100644 (file)
--- a/lib/pbuilder.py
+++ b/lib/pbuilder.py
@@ -51,14 +51,11 @@ 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):