Skip to content

Commit 09a0a90

Browse files
committed
Merge: uki_create_json.py should always sort its output
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/904 JIRA: https://issues.redhat.com/browse/RHEL-91668 ``` commit 1abe0b0e2c15654556a506a6cd82d887673436ac Author: Patrick Talbert <[email protected]> Date: Fri Apr 4 16:24:22 2025 +0200 [redhat] scripts: sort dumped keys in uki_create_json.py The order of the keys in the json output may change causing unnecessary churn in the dist-git diffs. Fix this by setting sort_keys=True in the json.dump() call. Outside of locale sorting differences this should provide a more stable experience. Signed-off-by: Patrick Talbert <[email protected]> ``` Signed-off-by: CKI Backport Bot <[email protected]> --- <small>Created 2025-05-15 11:45 UTC by backporter - [KWF FAQ](https://red.ht/kernel_workflow_doc) - [Slack #team-kernel-workflow](https://redhat-internal.slack.com/archives/C04LRUPMJQ5) - [Source](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/webhook/utils/backporter.py) - [Documentation](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/docs/README.backporter.md) - [Report an issue](https://issues.redhat.com/secure/CreateIssueDetails!init.jspa?pid=12334433&issuetype=1&priority=4&summary=backporter+webhook+issue&components=kernel-workflow+/+backporter)</small> Approved-by: Jan Stancek <[email protected]> Approved-by: Emanuele Giuseppe Esposito <[email protected]> Approved-by: Patrick Talbert <[email protected]> Approved-by: Vitaly Kuznetsov <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Julio Faracco <[email protected]>
2 parents 88f4b9d + 9b9ccd9 commit 09a0a90

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

redhat/scripts/uki_addons/uki_create_json.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def create_json(addons):
8686

8787
def write_json(obj, dest_file):
8888
with open(dest_file, 'w') as f:
89-
json.dump(obj , f, indent=4)
89+
json.dump(obj , f, indent=4, sort_keys=True)
9090
print(f'Processed addons files are in {dest_file}')
9191

9292
if __name__ == "__main__":

0 commit comments

Comments
 (0)