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