@ -493,14 +493,14 @@ class Britney(object):
self . options . heidi_delta_output = self . options . heidi_output + " Delta "
self . options . heidi_delta_output = self . options . heidi_output + " Delta "
self . options . nobreakall_arches = self . options . nobreakall_arches . split ( )
self . options . nobreakall_arches = self . options . nobreakall_arches . split ( )
self . options . fucked_arches = self . options . fucked _arches. split ( )
self . options . outofsync_arches = self . options . outofsync _arches. split ( )
self . options . break_arches = self . options . break_arches . split ( )
self . options . break_arches = self . options . break_arches . split ( )
self . options . new_arches = self . options . new_arches . split ( )
self . options . new_arches = self . options . new_arches . split ( )
# Sort the architecture list
# Sort the architecture list
allarches = sorted ( self . options . architectures . split ( ) )
allarches = sorted ( self . options . architectures . split ( ) )
arches = [ x for x in allarches if x in self . options . nobreakall_arches ]
arches = [ x for x in allarches if x in self . options . nobreakall_arches ]
arches + = [ x for x in allarches if x not in arches and x not in self . options . fucked _arches]
arches + = [ x for x in allarches if x not in arches and x not in self . options . outofsync _arches]
arches + = [ x for x in allarches if x not in arches and x not in self . options . break_arches ]
arches + = [ x for x in allarches if x not in arches and x not in self . options . break_arches ]
arches + = [ x for x in allarches if x not in arches and x not in self . options . new_arches ]
arches + = [ x for x in allarches if x not in arches and x not in self . options . new_arches ]
arches + = [ x for x in allarches if x not in arches ]
arches + = [ x for x in allarches if x not in arches ]
@ -1608,7 +1608,7 @@ class Britney(object):
base = ' stable '
base = ' stable '
text = " Not yet built on <a href= \" https://buildd.debian.org/status/logs.php?arch= %s &pkg= %s &ver= %s &suite= %s \" target= \" _blank \" > %s </a> (relative to testing) " % ( quote ( arch ) , quote ( src ) , quote ( source_u . version ) , base , arch )
text = " Not yet built on <a href= \" https://buildd.debian.org/status/logs.php?arch= %s &pkg= %s &ver= %s &suite= %s \" target= \" _blank \" > %s </a> (relative to testing) " % ( quote ( arch ) , quote ( src ) , quote ( source_u . version ) , base , arch )
if arch in self . options . fucked _arches:
if arch in self . options . outofsync _arches:
text = text + " (but %s isn ' t keeping up, so never mind) " % ( arch )
text = text + " (but %s isn ' t keeping up, so never mind) " % ( arch )
excuse . missing_build_on_ood_arch ( arch )
excuse . missing_build_on_ood_arch ( arch )
else :
else :
@ -1657,7 +1657,7 @@ class Britney(object):
# if there are out-of-date packages, warn about them in the excuse and set update_candidate
# if there are out-of-date packages, warn about them in the excuse and set update_candidate
# to False to block the update; if the architecture where the package is out-of-date is
# to False to block the update; if the architecture where the package is out-of-date is
# in the ` fucked _arches' list, then do not block the update
# in the ` outofsync _arches' list, then do not block the update
if oodbins :
if oodbins :
oodtxt = " "
oodtxt = " "
for v in oodbins . keys ( ) :
for v in oodbins . keys ( ) :
@ -1674,7 +1674,7 @@ class Britney(object):
" arch= %s &pkg= %s &ver= %s \" target= \" _blank \" > %s </a>: %s " % \
" arch= %s &pkg= %s &ver= %s \" target= \" _blank \" > %s </a>: %s " % \
( quote ( arch ) , quote ( src ) , quote ( source_u . version ) , arch , oodtxt )
( quote ( arch ) , quote ( src ) , quote ( source_u . version ) , arch , oodtxt )
if arch in self . options . fucked _arches:
if arch in self . options . outofsync _arches:
text = text + " (but %s isn ' t keeping up, so nevermind) " % ( arch )
text = text + " (but %s isn ' t keeping up, so nevermind) " % ( arch )
if not uptodatebins :
if not uptodatebins :
excuse . missing_build_on_ood_arch ( arch )
excuse . missing_build_on_ood_arch ( arch )
@ -2158,7 +2158,7 @@ class Britney(object):
continue
continue
# Don't add the binary if it is old cruft that is no longer in testing
# Don't add the binary if it is old cruft that is no longer in testing
if ( parch not in self . options . fucked _arches and
if ( parch not in self . options . outofsync _arches and
source_data . version != self . binaries [ suite ] [ parch ] [ 0 ] [ binary ] . source_version and
source_data . version != self . binaries [ suite ] [ parch ] [ 0 ] [ binary ] . source_version and
binary not in binaries_t [ parch ] [ 0 ] ) :
binary not in binaries_t [ parch ] [ 0 ] ) :
continue
continue
@ -2752,14 +2752,14 @@ class Britney(object):
self . do_all ( actions = removals )
self . do_all ( actions = removals )
# smooth updates
# smooth updates
removals = old_libraries ( self . sources , self . binaries , self . options . fucked _arches)
removals = old_libraries ( self . sources , self . binaries , self . options . outofsync _arches)
if self . options . smooth_updates :
if self . options . smooth_updates :
self . log ( " > Removing old packages left in testing from smooth updates " , type = " I " )
self . log ( " > Removing old packages left in testing from smooth updates " , type = " I " )
if removals :
if removals :
self . output_write ( " Removing packages left in testing for smooth updates ( %d ): \n %s " % \
self . output_write ( " Removing packages left in testing for smooth updates ( %d ): \n %s " % \
( len ( removals ) , old_libraries_format ( removals ) ) )
( len ( removals ) , old_libraries_format ( removals ) ) )
self . do_all ( actions = removals )
self . do_all ( actions = removals )
removals = old_libraries ( self . sources , self . binaries , self . options . fucked _arches)
removals = old_libraries ( self . sources , self . binaries , self . options . outofsync _arches)
else :
else :
self . log ( " > Not removing old packages left in testing from smooth updates (smooth-updates disabled) " ,
self . log ( " > Not removing old packages left in testing from smooth updates (smooth-updates disabled) " ,
type = " I " )
type = " I " )