Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-04 07:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "block-all source" handling

Browse Source 
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
This commit is contained in:
Adam D. Barratt 2012-04-03 21:44:32 +00:00
parent 8ee72661f0
commit 3bf778550c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
britney.py
View File

@ -4,7 +4,7 @@
# Copyright (C) 2001-2008 Anthony Towns <ajt@debian.org> # Copyright (C) 2001-2008 Anthony Towns <ajt@debian.org>
# Andreas Barth <aba@debian.org> # Andreas Barth <aba@debian.org>
# Fabio Tranchitella <kobold@debian.org> # Fabio Tranchitella <kobold@debian.org>
# Copyright (C) 2010-2011 Adam D. Barratt <adsb@debian.org> # Copyright (C) 2010-2012 Adam D. Barratt <adsb@debian.org>
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -1289,10 +1289,12 @@ class Britney(object):
# check if there is a `block' or `block-udeb' hint for this package, or a `block-all source' hint # check if there is a `block' or `block-udeb' hint for this package, or a `block-all source' hint
blocked = {} blocked = {}
for hint in self.hints.search(package=src): for hint in self.hints.search(package=src):
if hint.type == 'block' or (hint.type == 'block-all' and hint.package == 'source' and hint not in blocked['block']): if hint.type == 'block':
blocked['block'] = hint blocked['block'] = hint
if hint.type == 'block-udeb': if hint.type == 'block-udeb':
blocked['block-udeb'] = hint blocked['block-udeb'] = hint
for hint in self.hints.search(type='block-all', package='source'):
blocked.setdefault('block', hint)
# if the source is blocked, then look for an `unblock' hint; the unblock request # if the source is blocked, then look for an `unblock' hint; the unblock request
# is processed only if the specified version is correct. If a package is blocked # is processed only if the specified version is correct. If a package is blocked