[Git][reproducible-builds/diffoscope][master] 2 commits: d/tests/control.sh: appease shellcheck SC2129

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
46c468cb by Mattia Rizzolo at 2021-09-18T20:23:43+02:00
d/tests/control.sh: appease shellcheck SC2129

Gbp-Dch: Ignore
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
7ae076c7 by Mattia Rizzolo at 2021-09-18T20:24:11+02:00
d/tests: fix autopkgtest, where the androguard python module is not in the python3-androguard debian package

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- debian/tests/control
- debian/tests/control.sh


Changes:

=====================================
debian/tests/control
=====================================
@@ -7,7 +7,7 @@
 #   $ mv debian/tests/control.tmp debian/tests/control
 
 Tests: pytest-with-recommends
-Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apksigner, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, gnupg-utils, hdf5-tools, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd | vim-common, xz-utils, zip, zstd, python3-androguard, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
+Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apksigner, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, gnupg-utils, hdf5-tools, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd | vim-common, xz-utils, zip, zstd, androguard, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
 
 Tests: pytest
 Depends: python3-all, diffoscope, python3-pytest, python3-h5py, file, python3-tlsh


=====================================
debian/tests/control.sh
=====================================
@@ -2,9 +2,11 @@
 
 echo "Generating the debian/tests/control file..."
 
-echo "# DON'T MANUALLY MODIFY!" > debian/tests/control.tmp
-echo "# EDIT debian/tests/control.in INSTEAD!" >> debian/tests/control.tmp
-echo "#" >> debian/tests/control.tmp
+cat > debian/tests/control.tmp << EOF
+# DON'T MANUALLY MODIFY!
+# EDIT debian/tests/control.in INSTEAD!
+#
+EOF
 
 cat debian/tests/control.in >> debian/tests/control.tmp
 
@@ -23,3 +25,4 @@ sed -i "s,python3-rpm-python,python3-rpm," debian/tests/control.tmp
 sed -i "s,apktool,apktool [!ppc64el !s390x]," debian/tests/control.tmp
 sed -i "s,fp-utils,fp-utils [!ppc64el !s390x]," debian/tests/control.tmp
 sed -i "s,oggvideotools,oggvideotools [!s390x]," debian/tests/control.tmp
+sed -i "s,python3-androguard,androguard," debian/tests/control.tmp



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e998eb9dffc2c1611df64b3f92a884ccade6e68c...7ae076c7bf305dce2ead0e4691c3b3870e4f0147

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e998eb9dffc2c1611df64b3f92a884ccade6e68c...7ae076c7bf305dce2ead0e4691c3b3870e4f0147
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/20210918/4143bdd1/attachment.htm>