Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-06-09 08:41:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

britney.py: Fix migration of binNMUs for sources that have cruft

Browse Source 
If we are ignoring cruft, new sources with cruft are migrating, but
binNMUs aren't. Fix that.
This commit is contained in:
Emilio Pozuelo Monfort 2015-10-31 21:53:57 +01:00
parent be822d0791
commit 3bd5380afc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
britney.py
View File

@ -1155,11 +1155,20 @@ class Britney(object):
# if the new binary package is not from the same source as the testing one, then skip it # if the new binary package is not from the same source as the testing one, then skip it
# this implies that this binary migration is part of a source migration # this implies that this binary migration is part of a source migration
if not same_source(source_t[VERSION], pkgsv): if same_source(source_u[VERSION], pkgsv) and not same_source(source_t[VERSION], pkgsv):
anywrongver = True anywrongver = True
excuse.addhtml("From wrong source: %s %s (%s not %s)" % (pkg_name, binary_u[VERSION], pkgsv, source_t[VERSION])) excuse.addhtml("From wrong source: %s %s (%s not %s)" % (pkg_name, binary_u[VERSION], pkgsv, source_t[VERSION]))
continue continue
# cruft in unstable
if not same_source(source_u[VERSION], pkgsv) and not same_source(source_t[VERSION], pkgsv):
if self.options.ignore_cruft:
excuse.addhtml("Old cruft: %s %s (but ignoring cruft, so nevermind)" % (pkg_name, pkgsv))
else:
anywrongver = True
excuse.addhtml("Old cruft: %s %s" % (pkg_name, pkgsv))
continue
# if the source package has been updated in unstable and this is a binary migration, skip it # if the source package has been updated in unstable and this is a binary migration, skip it
# (the binaries are now out-of-date) # (the binaries are now out-of-date)
if same_source(source_t[VERSION], pkgsv) and source_t[VERSION] != source_u[VERSION]: if same_source(source_t[VERSION], pkgsv) and source_t[VERSION] != source_u[VERSION]: