[Git][reproducible-builds/diffoscope][master] 2 commits: Correct import masking issue.

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
6cb11741 by Chris Lamb at 2025-03-29T18:04:26+00:00
Correct import masking issue.

- - - - -
a70556c5 by Chris Lamb at 2025-03-29T18:05:23+00:00
releasing package diffoscope version 293

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,9 @@
-diffoscope (293) UNRELEASED; urgency=medium
+diffoscope (293) unstable; urgency=medium
 
-  * WIP (generated upon release).
+  [ Chris Lamb ]
+  * Correct import masking issue.
 
- -- Chris Lamb <lamby at debian.org>  Sat, 29 Mar 2025 17:21:19 +0000
+ -- Chris Lamb <lamby at debian.org>  Sat, 29 Mar 2025 18:05:20 +0000
 
 diffoscope (292) 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 = "292"
+VERSION = "293"


=====================================
diffoscope/comparators/directory.py
=====================================
@@ -80,16 +80,16 @@ def stat_results_same(stat1, stat2):
     return stat_result_to_tuple(stat1) == stat_result_to_tuple(stat2)
 
 
-def stat_result_to_tuple(stat):
+def stat_result_to_tuple(s):
     return (
-        stat.st_mode,
-        stat.st_uid,
-        stat.st_gid,
+        s.st_mode,
+        s.st_uid,
+        s.st_gid,
         # Directory sizes are essentially arbitrary and filesystem dependent,
         # and may even differ, depending on the history of the directory.
         # (See MR !150)
-        stat.st_size if not stat.S_ISDIR(stat.st_mode) else None,
-        stat.st_mtime,
+        s.st_size if not stat.S_ISDIR(s.st_mode) else None,
+        s.st_mtime,
     )
 
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e03594f6223e756a78b6b5565b4b79041a225847...a70556c5d0ef870b84fb3fc488588fe25a7a1483

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e03594f6223e756a78b6b5565b4b79041a225847...a70556c5d0ef870b84fb3fc488588fe25a7a1483
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/20250329/a1bea8db/attachment.htm>