[diffoscope] 01/04: Keep filelist sorted for deterministic output, and add newline at the end.

Maria Glukhova siamezzze-guest at moszumanska.debian.org
Sat Jan 21 17:07:31 CET 2017


This is an automated email from the git hooks/post-receive script.

siamezzze-guest pushed a commit to branch siamezzze/containers
in repository diffoscope.

commit 3444132c3c287d5251341dea42795d34db5040d4
Author: Maria Glukhova <siamezzze at gmail.com>
Date:   Fri Jan 20 23:06:41 2017 +0200

    Keep filelist sorted for deterministic output, and add newline at the end.
---
 diffoscope/comparators/utils/compare.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/diffoscope/comparators/utils/compare.py b/diffoscope/comparators/utils/compare.py
index 86a0f65..83ae7a1 100644
--- a/diffoscope/comparators/utils/compare.py
+++ b/diffoscope/comparators/utils/compare.py
@@ -76,8 +76,8 @@ def compare_containers(file1, file2, source=None):
         source="container type"
     )])
     details.extend([Difference.from_text(
-        "\n".join(container1.get_member_names()),
-        "\n".join(container2.get_member_names()),
+        "\n".join(sorted(container1.get_member_names())) + "\n",
+        "\n".join(sorted(container2.get_member_names())) + "\n",
         file1.name,
         file2.name,
         source="file list"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git


More information about the diffoscope mailing list