@ -1531,15 +1531,15 @@ class Britney(object):
# this list will contain the packages which are valid candidates;
# this list will contain the packages which are valid candidates;
# if a package is going to be removed, it will have a "-" prefix
# if a package is going to be removed, it will have a "-" prefix
upgrade_me = [ ]
upgrade_me = set ( )
upgrade_me_a ppend = upgrade_me . appen d # Every . in a loop slows it down
upgrade_me_a dd = upgrade_me . ad d # Every . in a loop slows it down
excuses = self . excuses = { }
excuses = self . excuses = { }
# for every source package in testing, check if it should be removed
# for every source package in testing, check if it should be removed
for pkg in testing :
for pkg in testing :
if should_remove_source ( pkg ) :
if should_remove_source ( pkg ) :
upgrade_me_a ppen d( " - " + pkg )
upgrade_me_a d d( " - " + pkg )
# for every source package in unstable check if it should be upgraded
# for every source package in unstable check if it should be upgraded
for pkg in unstable :
for pkg in unstable :
@ -1549,11 +1549,11 @@ class Britney(object):
if pkg in testing and not testing [ pkg ] . is_fakesrc :
if pkg in testing and not testing [ pkg ] . is_fakesrc :
for arch in architectures :
for arch in architectures :
if should_upgrade_srcarch ( pkg , arch , ' unstable ' ) :
if should_upgrade_srcarch ( pkg , arch , ' unstable ' ) :
upgrade_me_a ppen d( " %s / %s " % ( pkg , arch ) )
upgrade_me_a d d( " %s / %s " % ( pkg , arch ) )
# check if the source package should be upgraded
# check if the source package should be upgraded
if should_upgrade_src ( pkg , ' unstable ' ) :
if should_upgrade_src ( pkg , ' unstable ' ) :
upgrade_me_a ppen d( pkg )
upgrade_me_a d d( pkg )
# for every source package in *-proposed-updates, check if it should be upgraded
# for every source package in *-proposed-updates, check if it should be upgraded
for suite in [ ' pu ' , ' tpu ' ] :
for suite in [ ' pu ' , ' tpu ' ] :
@ -1563,11 +1563,11 @@ class Britney(object):
if pkg in testing :
if pkg in testing :
for arch in architectures :
for arch in architectures :
if should_upgrade_srcarch ( pkg , arch , suite ) :
if should_upgrade_srcarch ( pkg , arch , suite ) :
upgrade_me_a ppen d( " %s / %s _ %s " % ( pkg , arch , suite ) )
upgrade_me_a d d( " %s / %s _ %s " % ( pkg , arch , suite ) )
# check if the source package should be upgraded
# check if the source package should be upgraded
if should_upgrade_src ( pkg , suite ) :
if should_upgrade_src ( pkg , suite ) :
upgrade_me_a ppen d( " %s _ %s " % ( pkg , suite ) )
upgrade_me_a d d( " %s _ %s " % ( pkg , suite ) )
# process the `remove' hints, if the given package is not yet in upgrade_me
# process the `remove' hints, if the given package is not yet in upgrade_me
for hint in self . hints [ ' remove ' ] :
for hint in self . hints [ ' remove ' ] :
@ -1582,7 +1582,7 @@ class Britney(object):
continue
continue
# add the removal of the package to upgrade_me and build a new excuse
# add the removal of the package to upgrade_me and build a new excuse
upgrade_me_a ppen d( " - %s " % ( src ) )
upgrade_me_a d d( " - %s " % ( src ) )
excuse = Excuse ( " - %s " % ( src ) )
excuse = Excuse ( " - %s " % ( src ) )
excuse . set_vers ( tsrcv , None )
excuse . set_vers ( tsrcv , None )
excuse . addhtml ( " Removal request by %s " % ( hint . user ) )
excuse . addhtml ( " Removal request by %s " % ( hint . user ) )
@ -1595,7 +1595,7 @@ class Britney(object):
excuses [ excuse . name ] = excuse
excuses [ excuse . name ] = excuse
# extract the not considered packages, which are in the excuses but not in upgrade_me
# extract the not considered packages, which are in the excuses but not in upgrade_me
unconsidered = [ ename for ename in excuses if ename not in upgrade_me ]
unconsidered = { ename for ename in excuses if ename not in upgrade_me }
# invalidate impossible excuses
# invalidate impossible excuses
for e in excuses . values ( ) :
for e in excuses . values ( ) :