mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-05-16 04:51:32 +00:00
Fix-up a broken merge so smooth updates work again
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
This commit is contained in:
parent
6667b8fcf9
commit
b85db2b308
@ -1800,6 +1800,7 @@ class Britney:
|
|||||||
if item.architecture != 'source' and parch != item.architecture: continue
|
if item.architecture != 'source' and parch != item.architecture: continue
|
||||||
# do not remove binaries which have been hijacked by other sources
|
# do not remove binaries which have been hijacked by other sources
|
||||||
if binaries[parch][0][binary][SOURCE] != item.package: continue
|
if binaries[parch][0][binary][SOURCE] != item.package: continue
|
||||||
|
rdeps = binaries[parch][0][binary][RDEPENDS]
|
||||||
# if a smooth update is possible for the package, skip it
|
# if a smooth update is possible for the package, skip it
|
||||||
if not self.options.compatible and item.suite == 'unstable' and \
|
if not self.options.compatible and item.suite == 'unstable' and \
|
||||||
binary not in self.binaries[item.suite][parch][0] and \
|
binary not in self.binaries[item.suite][parch][0] and \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user