Your message dated Sun, 01 Dec 2024 20:36:47 +0000
with message-id <[email protected]>
and subject line Bug#1088748: fixed in git-filter-repo 2.45.0-2
has caused the Debian Bug report #1088748,
regarding git-filter-repo: FTBFS with zlib-ng
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1088748: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1088748
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-filter-repo
Version: 2.45.0-1
Severity: important
Tags: sid patch
control: affects -1 src:zlib-ng
control: forwarded -1 https://github.com/newren/git-filter-repo/pull/615
User: [email protected]
Usertags: zlib-ng-ftbfs
The testsuite of git-filter-repo fails because it tests against the
compressed file size which changes with zlib-ng. The patch attached
solves the situation and has been forwarded upstream.
Sebastian
From: Sebastian Andrzej Siewior <[email protected]>
Date: Sat, 30 Nov 2024 13:18:36 +0100
Subject: [PATCH] t9394: Mask compressed size for comparison.
Instead of trying to expect a static difference of the compressed
content between zlib and zlib-ng mask the compressed size and ignore it
while comparing.
Fixes: #614
Signed-off-by: Sebastian Andrzej Siewior <[email protected]>
---
t/t9390-filter-repo.sh | 85 +++++++++++++++++++++++-------------------
1 file changed, 47 insertions(+), 38 deletions(-)
diff --git a/t/t9390-filter-repo.sh b/t/t9390-filter-repo.sh
index 763517d8df40a..8d027bd4939ac 100755
--- a/t/t9390-filter-repo.sh
+++ b/t/t9390-filter-repo.sh
@@ -750,6 +750,8 @@ test_expect_success C_LOCALE_OUTPUT '--analyze' '
(
cd analyze_me &&
+ # Do the analysis, mask compressed size away to avoid different
+ # values with different zlib libraries.
git filter-repo --analyze &&
# It should not work again without a --force
@@ -778,82 +780,89 @@ test_expect_success C_LOCALE_OUTPUT '--analyze' '
Number of file extensions: 2
Total unpacked size (bytes): 206
- Total packed size (bytes): 387
+ Total packed size (bytes): XX
EOF
- head -n 9 README >actual &&
+ head -n 9 README | sed -E "s@(Total packed size .bytes.: )[0-9]+@\1XX@" >actual &&
test_cmp expect actual &&
cat >expect <<-\EOF &&
=== Files by sha and associated pathnames in reverse size ===
Format: sha, unpacked size, packed size, filename(s) object stored as
- a89c82a2d4b713a125a4323d25adda062cc0013d 44 48 numbers/medium.num
- c58ae2ffaf8352bd9860bf4bbb6ea78238dca846 35 41 fickle
- ccff62141ec7bae42e01a3dcb7615b38aa9fa5b3 24 40 fickle
- f00c965d8307308469e537302baa73048488f162 21 37 numbers/small.num
- 2aa69a2a708eed00cb390e30f6bcc3eed773f390 20 36 whatever
- 51b95456de9274c9a95f756742808dfd480b9b35 13 29 [capricious, fickle, mercurial]
- 732c85a1b3d7ce40ec8f78fd9ffea32e9f45fae0 5 20 [sequence/know, words/know]
- 34b6a0c9d02cb6ef7f409f248c0c1224ce9dd373 5 20 [sequence/to, words/to]
- 7ecb56eb3fa3fa6f19dd48bca9f971950b119ede 3 18 words/know
+ a89c82a2d4b713a125a4323d25adda062cc0013d 44 XX numbers/medium.num
+ c58ae2ffaf8352bd9860bf4bbb6ea78238dca846 35 XX fickle
+ ccff62141ec7bae42e01a3dcb7615b38aa9fa5b3 24 XX fickle
+ f00c965d8307308469e537302baa73048488f162 21 XX numbers/small.num
+ 2aa69a2a708eed00cb390e30f6bcc3eed773f390 20 XX whatever
+ 51b95456de9274c9a95f756742808dfd480b9b35 13 XX [capricious, fickle, mercurial]
+ 732c85a1b3d7ce40ec8f78fd9ffea32e9f45fae0 5 XX [sequence/know, words/know]
+ 34b6a0c9d02cb6ef7f409f248c0c1224ce9dd373 5 XX [sequence/to, words/to]
+ 7ecb56eb3fa3fa6f19dd48bca9f971950b119ede 3 XX words/know
EOF
- test_cmp expect blob-shas-and-paths.txt &&
+ sed -E < blob-shas-and-paths.txt "s@([0-9a-f]+\s+[0-9]+)\s+[0-9]+@\1 XX@" >actual &&
+ test_cmp expect actual &&
cat >expect <<-EOF &&
=== All directories by reverse size ===
Format: unpacked size, packed size, date deleted, directory name
- 206 387 <present> <toplevel>
- 65 85 2005-04-07 numbers
- 13 58 <present> words
- 10 40 <present> sequence
+ 206 XX <present> <toplevel>
+ 65 XX 2005-04-07 numbers
+ 13 XX <present> words
+ 10 XX <present> sequence
EOF
- test_cmp expect directories-all-sizes.txt &&
+ sed -E < directories-all-sizes.txt "s@(^\s+[0-9]+)(\s+)[0-9]+@\1 XX@" >actual &&
+ test_cmp expect actual &&
cat >expect <<-EOF &&
=== Deleted directories by reverse size ===
Format: unpacked size, packed size, date deleted, directory name
- 65 85 2005-04-07 numbers
+ 65 XX 2005-04-07 numbers
EOF
- test_cmp expect directories-deleted-sizes.txt &&
+ sed -E < directories-deleted-sizes.txt "s@(^\s+[0-9]+)(\s+)[0-9]+@\1 XX@" >actual &&
+ test_cmp expect actual &&
cat >expect <<-EOF &&
=== All extensions by reverse size ===
Format: unpacked size, packed size, date deleted, extension name
- 141 302 <present> <no extension>
- 65 85 2005-04-07 .num
+ 141 XX <present> <no extension>
+ 65 XX 2005-04-07 .num
EOF
- test_cmp expect extensions-all-sizes.txt &&
+ sed -E < extensions-all-sizes.txt "s@(^\s+[0-9]+)(\s+)[0-9]+@\1 XX@" >actual &&
+ test_cmp expect actual &&
cat >expect <<-EOF &&
=== Deleted extensions by reverse size ===
Format: unpacked size, packed size, date deleted, extension name
- 65 85 2005-04-07 .num
+ 65 XX 2005-04-07 .num
EOF
- test_cmp expect extensions-deleted-sizes.txt &&
+ sed -E < extensions-deleted-sizes.txt "s@(^\s+[0-9]+)(\s+)[0-9]+@\1 XX@" >actual &&
+ test_cmp expect actual &&
cat >expect <<-EOF &&
=== All paths by reverse accumulated size ===
Format: unpacked size, packed size, date deleted, path name
- 72 110 <present> fickle
- 44 48 2005-04-07 numbers/medium.num
- 8 38 <present> words/know
- 21 37 2005-04-07 numbers/small.num
- 20 36 <present> whatever
- 13 29 <present> mercurial
- 13 29 <present> capricious
- 5 20 <present> words/to
- 5 20 <present> sequence/to
- 5 20 <present> sequence/know
+ 72 XX <present> fickle
+ 44 XX 2005-04-07 numbers/medium.num
+ 8 XX <present> words/know
+ 21 XX 2005-04-07 numbers/small.num
+ 20 XX <present> whatever
+ 13 XX <present> mercurial
+ 13 XX <present> capricious
+ 5 XX <present> words/to
+ 5 XX <present> sequence/to
+ 5 XX <present> sequence/know
EOF
- test_cmp expect path-all-sizes.txt &&
+ sed -E < path-all-sizes.txt "s@(^\s+[0-9]+)(\s+)[0-9]+@\1 XX@" >actual &&
+ test_cmp expect actual &&
cat >expect <<-EOF &&
=== Deleted paths by reverse accumulated size ===
Format: unpacked size, packed size, date deleted, path name(s)
- 44 48 2005-04-07 numbers/medium.num
- 21 37 2005-04-07 numbers/small.num
+ 44 XX 2005-04-07 numbers/medium.num
+ 21 XX 2005-04-07 numbers/small.num
EOF
- test_cmp expect path-deleted-sizes.txt
+ sed -E < path-deleted-sizes.txt "s@(^\s+[0-9]+)(\s+)[0-9]+@\1 XX@" >actual &&
+ test_cmp expect actual
)
'
--
2.45.2
--- End Message ---
--- Begin Message ---
Source: git-filter-repo
Source-Version: 2.45.0-2
Done: Stefano Rivera <[email protected]>
We believe that the bug you reported is fixed in the latest version of
git-filter-repo, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Stefano Rivera <[email protected]> (supplier of updated git-filter-repo
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 01 Dec 2024 15:35:57 -0400
Source: git-filter-repo
Architecture: source
Version: 2.45.0-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Python Team <[email protected]>
Changed-By: Stefano Rivera <[email protected]>
Closes: 1088748
Changes:
git-filter-repo (2.45.0-2) unstable; urgency=medium
.
* Patch: Support zlib-ng in the test suite (Closes: #1088748).
Checksums-Sha1:
29bdedb36cdfd96f04ddaaf1de4fbded6032224b 1646 git-filter-repo_2.45.0-2.dsc
8df4b918472dc9423c2df0fbb34fb6ec46d58d27 7888
git-filter-repo_2.45.0-2.debian.tar.xz
9b575292ec32fa5a6228e94ea5bef17483cccadf 9141
git-filter-repo_2.45.0-2_source.buildinfo
Checksums-Sha256:
4861e7d2ce7a4554750b5b48b203d3e652e3e19949f6114d4c894349b16e55c9 1646
git-filter-repo_2.45.0-2.dsc
f6b3fadc4fedd508ec00c4e80cbeb44d0309f5f8f38fbf0139e3d3ff6f97ffa2 7888
git-filter-repo_2.45.0-2.debian.tar.xz
cb5f0a59403711ce2523175c5631841dde4489d5bba2d509cc68f954f2ab2c8f 9141
git-filter-repo_2.45.0-2_source.buildinfo
Files:
56d46a647ffdd2265496c4d684ac2967 1646 vcs optional git-filter-repo_2.45.0-2.dsc
37a86f9aa2c3615b467504fb828f97f1 7888 vcs optional
git-filter-repo_2.45.0-2.debian.tar.xz
dd4ac3d00b9bf1584e142cadb8e32273 9141 vcs optional
git-filter-repo_2.45.0-2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iIoEARYKADIWIQTumtb5BSD6EfafSCRHew2wJjpU2AUCZ0zAYBQcc3RlZmFub3JA
ZGViaWFuLm9yZwAKCRBHew2wJjpU2Cz2AQCFXBXiP2GNko0+viyneSoTdZD+R2Ce
6LV2hDNOmhsyWgEApX08kh979/z5/KtP6U9zXc2stVWNFcri8OcCRvQhlAM=
=5I1s
-----END PGP SIGNATURE-----
pgpJ6KWD4AhAW.pgp
Description: PGP signature
--- End Message ---
