Launchpad itself

Merge lp:~wgrant/launchpad/prober-no-title into lp:launchpad

  1. prober-no-title
  2. Merge into devel
Proposed by William Grant
Status: Merged
Merged at revision: 18270
Proposed branch: lp:~wgrant/launchpad/prober-no-title
Merge into: lp:launchpad
Diff against target: 25 lines (+7/-7)
1 file modified
lib/lp/registry/scripts/distributionmirror_prober.py (+7/-7)
To merge this branch: bzr merge lp:~wgrant/launchpad/prober-no-title
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+310647@code.launchpad.net

Commit message

Reduce prolixity of distributionmirror prober suite descriptions.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Consider switching the order of the architecture tag and the component name to be in line with the ordering in the dists hierarchy (i.e. "ubuntu zesty multiverse i386" rather than "ubuntu zesty i386 multiverse").

review: Approve
Revision history for this message
William Grant (wgrant) wrote :

I deliberately kept it that way around, since I generally consider component to be subordinate to architecture, and we treat it that way in all other public display (eg. +publishinghistory).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/registry/scripts/distributionmirror_prober.py'
2--- lib/lp/registry/scripts/distributionmirror_prober.py 2014-07-07 05:11:22 +0000
3+++ lib/lp/registry/scripts/distributionmirror_prober.py 2016-11-11 13:19:02 +0000
4@@ -536,14 +536,14 @@
5 MirrorDistroSeriesSource or a MirrorDistroArchSeries.
6 """
7 if IDistroArchSeries.providedBy(self.series):
8- text = ("Series %s, Architecture %s" %
9- (self.series.distroseries.title,
10- self.series.architecturetag))
11+ series = self.series.distroseries
12+ arch = self.series.architecturetag
13 else:
14- text = "Series %s" % self.series.title
15- text += (", Component %s and Pocket %s" %
16- (self.component.name, self.pocket.title))
17- return text
18+ series = self.series
19+ arch = 'source'
20+ return '%s %s %s %s' % (
21+ series.distribution.name, series.getSuite(self.pocket), arch,
22+ self.component.name)
23
24 def logError(self, failure, url):
25 msg = ("%s on %s of %s\n"