[Git][reproducible-builds/diffoscope][master] 2 commits: Fix a file(1)-related regression where .changes files that contained non-ASCII...

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
428bbfaa by Chris Lamb at 2022-02-19T14:56:51-08:00
Fix a file(1)-related regression where .changes files that contained non-ASCII text were not identified as such, therefore resulting in seemingly arbitrary packages on (for example) tests.reproducible-builds.org not actually comparing the files themselves. The non-ASCII parts could have been in the Maintainer or in the upload changelog. (Closes: reproducible-builds/diffoscope#291)

- - - - -
2e32780f by Chris Lamb at 2022-02-19T14:58:59-08:00
releasing package diffoscope version 205

- - - - -


3 changed files:

- debian/changelog
- diffoscope/__init__.py
- diffoscope/comparators/debian.py


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,16 @@
-diffoscope (205) UNRELEASED; urgency=medium
-
-  * WIP (generated upon release).
-
- -- Chris Lamb <lamby at debian.org>  Fri, 11 Feb 2022 10:43:35 -0800
+diffoscope (205) unstable; urgency=medium
+
+  * Fix a file(1)-related regression where .changes files that contained
+    non-ASCII text were not identified as being .changes files, resulting in
+    seemingly arbitrary packages on tests.reproducible-builds.org and elswhere
+    not comparing the package at all. The non-ASCII parts could have been in
+    the Maintainer or in the upload changelog, so we were effectively
+    penalising anyone outside of the Anglosphere.
+    (Closes: reproducible-builds/diffoscope#291)
+  * Don't print a warning to the console regarding NT_GNU_BUILD_ID changes in
+    ELF binaries.
+
+ -- Chris Lamb <lamby at debian.org>  Sat, 19 Feb 2022 14:58:57 -0800
 
 diffoscope (204) unstable; urgency=medium
 


=====================================
diffoscope/__init__.py
=====================================
@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "204"
+VERSION = "205"


=====================================
diffoscope/comparators/debian.py
=====================================
@@ -237,7 +237,13 @@ class DotChangesFile(DebControlFile):
 
     # .changes files can be identified "data" if they contain non-printable
     # characters (Re: reproducible-builds/diffoscope#286)
-    FILE_TYPE_RE = re.compile(r"^(ASCII text|UTF-8 Unicode text|data)")
+    #
+    # In addition, different versions of file(1) can emit "UTF-8 Unicode text"
+    # or "UTF-8 Unicode text" for .changes files that use non-ASCII characters,
+    # so we have to look for both. (Re: reproducible-builds/diffoscope#291)
+    FILE_TYPE_RE = re.compile(
+        r"^(ASCII text|UTF-8 Unicode text|data|Unicode text, UTF-8 text)"
+    )
 
     @classmethod
     def recognizes(cls, file):



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/b0fb9c567cb76b6047fa38323d62b448da8191f4...2e32780fbded0f6adc98e2e7318cb2893f3bc98e

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/b0fb9c567cb76b6047fa38323d62b448da8191f4...2e32780fbded0f6adc98e2e7318cb2893f3bc98e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20220219/42137a0f/attachment.htm>