@@ -158,15 +158,15 @@ def diff_source_control(diff_from, diff_to):
158
158
print (f" --> { origin_url } /compare/{ config_from ['commit' ][:7 ]} ...{ config_to ['commit' ][:7 ]} " )
159
159
160
160
161
- def diff_rpms_json (diff_from , diff_to ):
162
- diff_rpms (diff_from , diff_to , json = True )
161
+ def diff_rpms_rpm_ostree_json (diff_from , diff_to ):
162
+ diff_rpms_rpm_ostree (diff_from , diff_to , json = True )
163
163
164
164
165
- def diff_rpms_no_json (diff_from , diff_to ):
166
- diff_rpms (diff_from , diff_to , json = False )
165
+ def diff_rpms_rpm_ostree_no_json (diff_from , diff_to ):
166
+ diff_rpms_rpm_ostree (diff_from , diff_to , json = False )
167
167
168
168
169
- def diff_rpms (diff_from , diff_to , json ):
169
+ def diff_rpms_rpm_ostree (diff_from , diff_to , json ):
170
170
ref_from = diff_from .id
171
171
ref_to = diff_to .id
172
172
cmd = ['rpm-ostree' , 'db' , 'diff' , '--repo' , TMP_REPO , ref_from , ref_to ]
@@ -480,9 +480,9 @@ def cache_dir(dir):
480
480
# unfortunately, this has to come at the end to resolve functions
481
481
DIFFERS = [
482
482
Differ ("rpms" , "Diff RPMs" ,
483
- needs_ostree = OSTreeImport .FULL , function = diff_rpms_no_json ),
483
+ needs_ostree = OSTreeImport .FULL , function = diff_rpms_rpm_ostree_no_json ),
484
484
Differ ("rpms-json" , "Diff RPMs, output JSON" ,
485
- needs_ostree = OSTreeImport .FULL , function = diff_rpms_json ),
485
+ needs_ostree = OSTreeImport .FULL , function = diff_rpms_rpm_ostree_json ),
486
486
Differ ("source-control" , "Diff config and COSA input commits" ,
487
487
needs_ostree = OSTreeImport .NO , function = diff_source_control ),
488
488
Differ ("ostree-ls" , "Diff OSTree contents using 'ostree diff'" ,
0 commit comments