This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=59ce405f33d510ee81220b9505d0ddf07802bfee commit 59ce405f33d510ee81220b9505d0ddf07802bfee Author: Guillem Jover <[email protected]> AuthorDate: Sat Jul 6 20:06:35 2024 +0200 test: Unify all ar invocations into create, extract and list Instead of modifying ar archives, simplify the handling into three actions, so that we can replace the external ar usage with our own simple implementation. This also makes the format of the archives we are creating more obvious. --- src/at/deb-format.at | 15 +++++---------- src/at/deb-split.at | 11 +++++------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/at/deb-format.at b/src/at/deb-format.at index e67ee105d..c3ccca2f9 100644 --- a/src/at/deb-format.at +++ b/src/at/deb-format.at @@ -267,8 +267,7 @@ data.tar AT_CHECK([ # Test missing debian-binary member -cp pkg-templ.deb pkg-missing-magic.deb -ar d pkg-missing-magic.deb debian-binary +ar qSc pkg-missing-magic.deb control.tar data.tar ar t pkg-missing-magic.deb dpkg-deb -I pkg-missing-magic.deb ], [2], [control.tar @@ -278,8 +277,7 @@ data.tar AT_CHECK([ # Test missing control member -cp pkg-templ.deb pkg-missing-control.deb -ar d pkg-missing-control.deb control.tar +ar qSc pkg-missing-control.deb debian-binary data.tar ar t pkg-missing-control.deb dpkg-deb -I pkg-missing-control.deb ], [2], [debian-binary @@ -289,8 +287,7 @@ data.tar AT_CHECK([ # Test missing data member -cp pkg-templ.deb pkg-missing-data.deb -ar d pkg-missing-data.deb data.tar +ar qSc pkg-missing-data.deb debian-binary control.tar ar t pkg-missing-data.deb dpkg-deb -c pkg-missing-data.deb ], [2], [debian-binary @@ -348,8 +345,7 @@ data.tar AT_CHECK([ # Test swapped control and data members -cp pkg-templ.deb pkg-swap-members.deb -ar ma data.tar pkg-swap-members.deb control.tar +ar qSc pkg-swap-members.deb debian-binary data.tar control.tar ar t pkg-swap-members.deb dpkg-deb -I pkg-swap-members.deb ], [2], [debian-binary @@ -360,8 +356,7 @@ control.tar AT_CHECK([ # Test extra member -cp pkg-templ.deb pkg-extra-member.deb -ar qS pkg-extra-member.deb unknown +ar qSc pkg-extra-member.deb debian-binary control.tar data.tar unknown ar t pkg-extra-member.deb dpkg-deb -I pkg-extra-member.deb ], [], [debian-binary diff --git a/src/at/deb-split.at b/src/at/deb-split.at index 69e777b1b..d12a6081d 100644 --- a/src/at/deb-split.at +++ b/src/at/deb-split.at @@ -91,8 +91,8 @@ pkg-split-part-magic-extra.deb: AT_CHECK([ # Test missing debian-split -cp pkg-split-part.1of10.deb pkg-split-part-missing-magic.deb -ar d pkg-split-part-missing-magic.deb debian-split +ar x pkg-split-part.1of10.deb +ar qSc pkg-split-part-missing-magic.deb data.1 ar t pkg-split-part-missing-magic.deb dpkg-split -I pkg-split-part-missing-magic.deb ], [], [data.1 @@ -101,8 +101,8 @@ file 'pkg-split-part-missing-magic.deb' is not an archive part AT_CHECK([ # Test missing data part member -cp pkg-split-part.1of10.deb pkg-split-part-missing-data.deb -ar d pkg-split-part-missing-data.deb data.1 +ar x pkg-split-part.1of10.deb +ar qSc pkg-split-part-missing-data.deb debian-split ar t pkg-split-part-missing-data.deb dpkg-split -I pkg-split-part-missing-data.deb ], [2], [debian-split @@ -123,9 +123,8 @@ data.1 AT_CHECK_UNQUOTED([ # Test unknown extra member -cp pkg-split-part.1of10.deb pkg-split-part-extra-member.deb echo "some content" >unknown -ar qS pkg-split-part-extra-member.deb unknown +ar qSc pkg-split-part-extra-member.deb debian-split data.1 unknown ar t pkg-split-part-extra-member.deb dpkg-split -I pkg-split-part-extra-member.deb ], [], [debian-split -- Dpkg.Org's dpkg
