Make tpu optional in the config file

Signed-off-by: Niels Thykier <niels@thykier.net>

britney.conf.template

@@ -5,9 +5,8 @@
 # themselves.
 UNSTABLE          = /path/to/source/suite
 TESTING           = /path/to/target/suite
-# Items in these two suites will require manual approval
+# Items in these two (optional) suites will require manual approval
-TPU               = /path/to/secondary-source/suite
+# TPU               = /path/to/secondary-source/suite
-# Optional suite
 # PU                = /path/to/another-source/suite
 
 # List of components to work with

britney.py

@@ -298,12 +298,11 @@ class Britney(object):
         # read the source and binary packages for the involved distributions
         self.sources['testing'] = self.read_sources(self.options.testing)
         self.sources['unstable'] = self.read_sources(self.options.unstable)
-        self.sources['tpu'] = self.read_sources(self.options.tpu)
+        for suite in ('tpu', 'pu'):
-
+            if hasattr(self.options, suite):
-        if hasattr(self.options, 'pu'):
+                self.sources[suite] = self.read_sources(getattr(self.options, suite))
-            self.sources['pu'] = self.read_sources(self.options.pu)
+            else:
-        else:
+                self.sources[suite] = {}
-            self.sources['pu'] = {}
 
         self.binaries['testing'] = {}
         self.binaries['unstable'] = {}
@@ -312,14 +311,14 @@ class Britney(object):
 
         for arch in self.options.architectures:
             self.binaries['unstable'][arch] = self.read_binaries(self.options.unstable, "unstable", arch)
-            self.binaries['tpu'][arch] = self.read_binaries(self.options.tpu, "tpu", arch)
+            for suite in ('tpu', 'pu'):
-            if hasattr(self.options, 'pu'):
+                if hasattr(self.options, suite):
-                self.binaries['pu'][arch] = self.read_binaries(self.options.pu, "pu", arch)
+                    self.binaries[suite][arch] = self.read_binaries(getattr(self.options, suite), suite, arch)
-            else:
+                else:
-                # _build_installability_tester relies on it being
+                    # _build_installability_tester relies on this being
-                # properly initialised, so insert two empty dicts
+                    # properly initialised, so insert two empty dicts
-                # here.
+                    # here.
-                self.binaries['pu'][arch] = ({}, {})
+                    self.binaries[suite][arch] = ({}, {})
             # Load testing last as some live-data tests have more complete information in
             # unstable
             self.binaries['testing'][arch] = self.read_binaries(self.options.testing, "testing", arch)