@@ -41,10 +41,7 @@ def get_commit_maps_from_backport_data(repo_path, branch, common_tag):
4141 # get_backport_commit_data returns:
4242 # { "upstream_sha": { "repo_commit": "ciq_sha", "upstream_subject": "...", ... } }
4343 backport_data , success = get_backport_commit_data (
44- repo_path ,
45- branch ,
46- common_tag .decode () if isinstance (common_tag , bytes ) else common_tag ,
47- allow_duplicates = True
44+ repo_path , branch , common_tag .decode () if isinstance (common_tag , bytes ) else common_tag , allow_duplicates = True
4845 )
4946
5047 if not success :
@@ -373,9 +370,7 @@ def check_for_fips_protected_changes(repo, branch, common_tag):
373370 for ciq_commit , upstream_commit in rolling_commit_map .items ():
374371 if upstream_commit and upstream_commit in new_base_commit_map_rev :
375372 new_base_ciq_commit = new_base_commit_map_rev [upstream_commit ]
376- print (
377- f"- Old commit { ciq_commit [:12 ]} backported upstream { upstream_commit [:12 ]} "
378- )
373+ print (f"- Old commit { ciq_commit [:12 ]} backported upstream { upstream_commit [:12 ]} " )
379374 print (
380375 f" Already in new base as { new_base_ciq_commit [:12 ]} : { repo .git .show ('--pretty=%s' , '-s' , new_base_ciq_commit )} "
381376 )
@@ -427,9 +422,11 @@ def check_for_fips_protected_changes(repo, branch, common_tag):
427422
428423 # Loop until conflict is resolved or user aborts
429424 while True :
430- user_input = input (
431- '[rolling release update] Press Enter when resolved (or type "stop"/"abort" to exit): '
432- ).strip ().lower ()
425+ user_input = (
426+ input ('[rolling release update] Press Enter when resolved (or type "stop"/"abort" to exit): ' )
427+ .strip ()
428+ .lower ()
429+ )
433430
434431 if user_input in ["stop" , "abort" ]:
435432 print ("[rolling release update] ========================================" )
@@ -453,7 +450,9 @@ def check_for_fips_protected_changes(repo, branch, common_tag):
453450 # Check if CHERRY_PICK_HEAD still exists (indicates incomplete cherry-pick)
454451 cherry_pick_head = os .path .join (args .repo , ".git" , "CHERRY_PICK_HEAD" )
455452 if os .path .exists (cherry_pick_head ):
456- print ("[rolling release update] ERROR: Cherry-pick not completed (.git/CHERRY_PICK_HEAD still exists)" )
453+ print (
454+ "[rolling release update] ERROR: Cherry-pick not completed (.git/CHERRY_PICK_HEAD still exists)"
455+ )
457456 print ("[rolling release update] Please complete the cherry-pick with:" )
458457 print ("[rolling release update] git cherry-pick --continue" )
459458 print ("[rolling release update] or abort with:" )
0 commit comments