[Git][reproducible-builds/diffoscope][master] Normalise filesystem stat(2) "birth times" (ie. st_birthtime) in the same way...

Chris Lamb gitlab at salsa.debian.org
Fri May 29 09:08:58 UTC 2020



Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
b7de938a by Chris Lamb at 2020-05-29T10:08:29+01:00
Normalise filesystem stat(2) "birth times" (ie. st_birthtime) in the same way we do with stat(1)'s "Access:" and "Change:" times to fix a nondetermistic build failure on GNU Guix. Thanks, Vagrant and Chocimier. (Closes: reproducible-builds/diffoscope#74)

- - - - -


1 changed file:

- diffoscope/comparators/directory.py


Changes:

=====================================
diffoscope/comparators/directory.py
=====================================
@@ -79,6 +79,7 @@ else:
         INODE_RE = re.compile(r"Inode: [0-9]+\s+")
         ACCESS_TIME_RE = re.compile(r"^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$")
         CHANGE_TIME_RE = re.compile(r"^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$")
+        BIRTH_TIME_RE = re.compile(r"^\s*Birth:.*$")
 
         def filter(self, line):
             line = line.decode("utf-8")
@@ -87,6 +88,7 @@ else:
             line = Stat.INODE_RE.sub("", line)
             line = Stat.ACCESS_TIME_RE.sub("", line)
             line = Stat.CHANGE_TIME_RE.sub("", line)
+            line = Stat.BIRTH_TIME_RE.sub("", line)
             return line.encode("utf-8")
 
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/b7de938a11eb396710bf1df7b9dad66de00adb6e

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/b7de938a11eb396710bf1df7b9dad66de00adb6e
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/20200529/fbc98580/attachment.htm>


More information about the rb-commits mailing list