From afc31e115e00ac2c00a2586c8e821004857e80e4 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Thu, 19 Sep 2024 19:53:11 +0800
Subject: [PATCH] Show \r when diffing reproducible apk

---
 fdroidserver/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index dcd53b59..29a5747d 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -3854,7 +3854,7 @@ def compare_apks(apk1, apk2, tmp_dir, log_dir=None):
     if len(lines) != 1 or 'META-INF' not in lines[0]:
         if set_command_in_config('meld'):
             p = FDroidPopen([config['meld'], apk1dir, apk2dir], output=False)
-        return "Unexpected diff output:\n" + p.output
+        return "Unexpected diff output:\n" + p.output.replace("\r", "^M")
 
     # since everything verifies, delete the comparison to keep cruft down
     shutil.rmtree(apk1dir)