Skip to content

Commit 228e18f

Browse files
committed
cmd-diff: make rpm diff function names more specific
This set of function names leverages rpm-ostree for the diffing.
1 parent 8ba08a9 commit 228e18f

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/cmd-diff

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,15 @@ def diff_source_control(diff_from, diff_to):
150150
print(f" --> {origin_url}/compare/{config_from['commit'][:7]}...{config_to['commit'][:7]}")
151151

152152

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)
155155

156156

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)
159159

160160

161-
def diff_rpms(diff_from, diff_to, json):
161+
def diff_rpms_rpm_ostree(diff_from, diff_to, json):
162162
ref_from = diff_from.id
163163
ref_to = diff_to.id
164164
cmd = ['rpm-ostree', 'db', 'diff', '--repo', TMP_REPO, ref_from, ref_to]
@@ -473,9 +473,9 @@ def cache_dir(dir):
473473
# unfortunately, this has to come at the end to resolve functions
474474
DIFFERS = [
475475
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),
477477
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),
479479
Differ("source-control", "Diff config and COSA input commits",
480480
needs_ostree=OSTreeImport.NO, function=diff_source_control),
481481
Differ("ostree-ls", "Diff OSTree contents using 'ostree diff'",

0 commit comments

Comments
 (0)