launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/prober-no-title into lp:launchpad.

Commit message:
Reduce prolixity of distributionmirror prober suite descriptions.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/prober-no-title/+merge/310647

Reduce prolixity of distributionmirror prober suite descriptions.

Old:
Thu Nov 10 08:16:51 2016: Deleted MirrorDistroArchSeries of Series The Zesty Zapus, Architecture i386, Component multiverse and Pocket Release with url http://ubuntu.cybercomhosting.com/ubuntu//dists/zesty/multiverse/binary-i386/Packages.gz because: Bad response code: 404.

New:
Thu Nov 10 08:16:51 2016: Deleted MirrorDistroArchSeries of ubuntu zesty i386 multiverse with url http://ubuntu.cybercomhosting.com/ubuntu//dists/zesty/multiverse/binary-i386/Packages.gz because: Bad response code: 404.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/prober-no-title into lp:launchpad.

=== modified file 'lib/lp/registry/scripts/distributionmirror_prober.py'
--- lib/lp/registry/scripts/distributionmirror_prober.py	2014-07-07 05:11:22 +0000
+++ lib/lp/registry/scripts/distributionmirror_prober.py	2016-11-11 13:19:02 +0000
@@ -536,14 +536,14 @@
         MirrorDistroSeriesSource or a MirrorDistroArchSeries.
         """
         if IDistroArchSeries.providedBy(self.series):
-            text = ("Series %s, Architecture %s" %
-                    (self.series.distroseries.title,
-                     self.series.architecturetag))
+            series = self.series.distroseries
+            arch = self.series.architecturetag
         else:
-            text = "Series %s" % self.series.title
-        text += (", Component %s and Pocket %s" %
-                 (self.component.name, self.pocket.title))
-        return text
+            series = self.series
+            arch = 'source'
+        return '%s %s %s %s' % (
+            series.distribution.name, series.getSuite(self.pocket), arch,
+            self.component.name)
 
     def logError(self, failure, url):
         msg = ("%s on %s of %s\n"