Merge lp:~robru/britney/optional-heidi into lp:~ubuntu-release/britney/britney2-ubuntu

[Robert Bruce Park]

Wasn't sure how to write tests for this but you can see in staging that heidi is not in the logs:

https://requests.ci-train.staging.ubuntu.com/static/britney/last-run.txt

And the heidi files are not among the output data:

https://requests.ci-train.staging.ubuntu.com/static/britney/report.txt

(just grep for heidi in both of those files and you should see none)

[lp:~robru/britney/optional-heidi]

563. By Robert Bruce Park on 2016-01-20

Oops.

[Robert Bruce Park (robru)]

One question, this just disables the writing to disk. Is it possible to disable the calculation of this information as well out of that needed for other things?

[Martin Pitt (pitti)]

LGTM, thank you!

> Is it possible to disable the calculation of this information as well out of that needed for other things?

AFAICS this just passes on self.sources and self.binaries to write_heidi(), and these lists are absolutely required for britney's functionality. So I don't think there's anything extra to disable here.

review: Approve

[Martin Pitt (pitti)]

Can you please send this to the Debian BTS as well?

=== modified file 'britney.py'
--- britney.py	2016-01-19 20:05:32 +0000
+++ britney.py	2016-01-20 02:17:12 +0000
@@ -453,7 +453,7 @@
                          not getattr(self.options, k.lower()):
                         setattr(self.options, k.lower(), v)
 
-        if not hasattr(self.options, "heidi_delta_output"):
+        if self.options.heidi_output and not hasattr(self.options, "heidi_delta_output"):
             self.options.heidi_delta_output = self.options.heidi_output + "Delta"
 
         self.options.nobreakall_arches = self.options.nobreakall_arches.split()
@@ -3023,14 +3023,15 @@
             except AttributeError:
                 self.write_dates(self.options.testing, self.dates)
 
-            # write HeidiResult
-            self.__log("Writing Heidi results to %s" % self.options.heidi_output)
-            write_heidi(self.options.heidi_output, self.sources["testing"],
-                        self.binaries["testing"])
+            if self.options.heidi_output:
+                # write HeidiResult
+                self.__log("Writing Heidi results to %s" % self.options.heidi_output)
+                write_heidi(self.options.heidi_output, self.sources["testing"],
+                            self.binaries["testing"])
 
-            self.__log("Writing delta to %s" % self.options.heidi_delta_output)
-            write_heidi_delta(self.options.heidi_delta_output,
-                              self.all_selected)
+                self.__log("Writing delta to %s" % self.options.heidi_delta_output)
+                write_heidi_delta(self.options.heidi_delta_output,
+                                  self.all_selected)
 
 
         self.printuninstchange()