@@ -99,7 +99,7 @@ def printer(i, name):
9999 else :
100100 r = '\r '
101101 line = '{}[{}] {}/{} {}: {}{} ' .format (
102- r , progress , i , total ,text , name , ' ' * pad_len )
102+ r , progress , i , total , text , name , ' ' * pad_len )
103103 print (line , end = '' , file = sys .stderr )
104104 sys .stderr .flush ()
105105 return len (name )
@@ -255,7 +255,6 @@ def run(self):
255255 all_provides = {str (r ).split ()[0 ]: p for p in python_versions for r in p .provides
256256 if not str (r ).startswith (PROVIDES_BLACKLIST )}
257257 for pkg in progressbar (sorted (python_versions .keys ()), 'Getting requirements' ):
258-
259258 reqs = set ()
260259 build_reqs = set ()
261260 for provide in pkg .provides :
@@ -345,36 +344,38 @@ def bug_namegetter(bug):
345344
346345 rank = ['NEW' , 'ASSIGNED' , 'POST' , 'MODIFIED' , 'ON_QA' , 'VERIFIED' ,
347346 'RELEASE_PENDING' , 'CLOSED' ]
347+
348348 def key (bug ):
349349 return rank .index (bug .status ), bug .last_change_time
350+
350351 bugs = sorted (bugs , key = key )
351352
352353 for bug in progressbar (bugs , 'Merging bugs' ,
353354 namegetter = bug_namegetter ):
354355 r = json_output .get (bug .component , {})
355356 if 'bug' in r .get ('links' , {}):
356357 continue
357- url = '{bug.weburl}#{bug.status}' .format (bug = bug )
358358 status = bug .status
359359 if bug .resolution :
360360 status += ' ' + bug .resolution
361361 # Let's get the datetime of the last comment and convert to string
362- last_change_datetime = time .strftime ('%Y-%m-%d %H:%M:%S' ,
363- bug .last_change_time .timetuple ())
364- r .setdefault ('links' , {})['bug' ] = [bug .weburl , status ,
365- last_change_datetime ]
362+ last_change_datetime = time .strftime (
363+ '%Y-%m-%d %H:%M:%S' ,
364+ bug .last_change_time .timetuple ())
365+ r .setdefault ('links' , {})['bug' ] = [
366+ bug .weburl , status , last_change_datetime ]
366367
367368 for tb in bug .blocks :
368369 if tb in ADDITIONAL_TRACKER_BUGS :
369- r .setdefault ('tracking_bugs' , []) \
370- . append ( BUGZILLA_BUG_URL .format (tb ))
371-
372- if (any (tb in bug .blocks for tb in MISPACKAGED_TRACKER_BUG_IDS )
373- and r .get ('status' ) == 'idle' ):
374- r ['status' ] = "mispackaged"
375- r ['note' ] = ('There is a problem in Fedora packaging, ' +
376- 'not necessarily with the software itself. ' +
377- 'See the linked Fedora bug.' )
370+ r .setdefault ('tracking_bugs' , []). append (
371+ BUGZILLA_BUG_URL .format (tb ))
372+
373+ if (any (tb in bug .blocks for tb in MISPACKAGED_TRACKER_BUG_IDS ) and
374+ r .get ('status' ) == 'idle' ):
375+ r ['status' ] = "mispackaged"
376+ r ['note' ] = ('There is a problem in Fedora packaging, '
377+ 'not necessarily with the software itself. '
378+ 'See the linked Fedora bug.' )
378379
379380 # Print out output
380381
0 commit comments