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