Skip to content

Commit f6bbbf1

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 e68ed8c commit f6bbbf1

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
@@ -155,15 +155,15 @@ def diff_source_control(diff_from, diff_to):
155155
print(f" --> {origin_url}/compare/{config_from['commit'][:7]}...{config_to['commit'][:7]}")
156156

157157

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

161161

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

165165

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

0 commit comments

Comments
 (0)