diff --git a/britney.py b/britney.py index e5d4160..5e5d323 100755 --- a/britney.py +++ b/britney.py @@ -1681,17 +1681,17 @@ class Britney(object): oodtxt = "" for v in oodbins.keys(): if oodtxt: oodtxt = oodtxt + "; " - oodtxt = oodtxt + "%s (from %s)" % \ - (", ".join(sorted(oodbins[v])), quote(arch), quote(src), quote(v), v) + oodtxt = oodtxt + "%s (from %s)" % \ + (", ".join(sorted(oodbins[v])), self.options.distribution, quote(src.split("/")[0]), quote(v), quote(arch), v) if uptodatebins: - text = "old binaries left on %s: %s" % \ - (quote(arch), quote(src), quote(source_u.version), arch, oodtxt) + text = "old binaries left on %s: %s" % \ + (self.options.distribution, quote(src.split("/")[0]), quote(source_u.version), quote(arch), arch, oodtxt) else: - text = "missing build on %s: %s" % \ - (quote(arch), quote(src), quote(source_u.version), arch, oodtxt) + text = "missing build on %s: %s" % \ + (self.options.distribution, quote(src.split("/")[0]), quote(source_u.version), quote(arch), arch, oodtxt) if arch in self.options.outofsync_arches: text = text + " (but %s isn't keeping up, so nevermind)" % (arch) @@ -1752,7 +1752,7 @@ class Britney(object): base = 'testing' else: base = 'stable' - text = "Not yet built on %s (relative to testing)" % (quote(arch), quote(src), quote(source_u.version), base, arch) + text = "Not yet built on %s (relative to testing)" % (self.options.distribution, quote(src.split("/")[0]), quote(source_u.version), quote(arch), arch) if arch in self.options.outofsync_arches: text = text + " (but %s isn't keeping up, so never mind)" % (arch)