Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-12 23:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

When undoing a hint, remove new binaries before re-adding those removed

Browse Source 
If new binary packages are removed from the system afer the original
packages have been re-introduced, a binary package which has moved
between source packages may be removed entirely.  See Debian bug #624716
for more details.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
This commit is contained in:
Adam D. Barratt 2011-05-04 18:45:11 +00:00
parent ed745af789
commit ef71f0e33a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
britney.py
View File

@ -2483,6 +2483,7 @@ class Britney:
del self.sources['testing'][k[1:]] del self.sources['testing'][k[1:]]
else: self.sources['testing'][k] = undo['sources'][k] else: self.sources['testing'][k] = undo['sources'][k]
for (undo, pkg, pkg_name, suite) in lundo:
# undo the changes (new binaries) # undo the changes (new binaries)
if pkg[0] != '-' and pkg_name in self.sources[suite]: if pkg[0] != '-' and pkg_name in self.sources[suite]:
for p in self.sources[suite][pkg_name][BINARIES]: for p in self.sources[suite][pkg_name][BINARIES]:
@ -2491,6 +2492,7 @@ class Britney:
del self.binaries['testing'][arch][0][binary] del self.binaries['testing'][arch][0][binary]
self.systems[arch].remove_binary(binary) self.systems[arch].remove_binary(binary)
for (undo, pkg, pkg_name, suite) in lundo:
# undo the changes (binaries) # undo the changes (binaries)
for p in undo['binaries'].keys(): for p in undo['binaries'].keys():
binary, arch = p.split("/") binary, arch = p.split("/")
@ -2499,6 +2501,7 @@ class Britney:
self.systems[arch].remove_binary(binary[1:]) self.systems[arch].remove_binary(binary[1:])
else: self.binaries['testing'][arch][0][binary] = undo['binaries'][p] else: self.binaries['testing'][arch][0][binary] = undo['binaries'][p]
for (undo, pkg, pkg_name, suite) in lundo:
# undo the changes (virtual packages) # undo the changes (virtual packages)
for p in undo['nvirtual']: for p in undo['nvirtual']:
j, arch = p.split("/") j, arch = p.split("/")