[Git][reproducible-builds/diffoscope][master] 2 commits: Add a missing comma.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
f4952da2 by Chris Lamb at 2020-11-23T10:55:24+00:00
Add a missing comma.

- - - - -
a615cc31 by Chris Lamb at 2020-11-23T11:03:04+00:00
Don't depends on radare2 in the Debian autopkgtests; it will not be in bullseye due to security considerations (see #950372). (Closes: #975313)

- - - - -


3 changed files:

- debian/tests/control
- debian/tests/control.sh
- diffoscope/main.py


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, radare2, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, wabt, xmlbeans, xxd | vim-common, xz-utils, zip, zstd, 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, unzip, wabt, xmlbeans, xxd | vim-common, xz-utils, zip, zstd, 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
=====================================
@@ -15,6 +15,8 @@ sed -i "s#%PYRECOMMENDS%#$(python3 -c "import distutils.core; \
 	print(', '.join(sorted(['python3-{}'.format(x) for y in setup.extras_require.values() for x in y])))" \
 )#" debian/tests/control.tmp
 
+# Don't test-depend on radare2; not in bullseye for security reasons. (#950372)
+sed -i "s#radare2, ##" debian/tests/control.tmp
 
 sed -i "s,python3-python-debian,python3-debian," debian/tests/control.tmp
 sed -i "s,python3-rpm-python,python3-rpm," debian/tests/control.tmp


=====================================
diffoscope/main.py
=====================================
@@ -564,7 +564,7 @@ class ListDebianSubstvarsAction(argparse._StoreTrueAction):
         ComparatorManager().reload()
 
         # ... however for the generated substvar to be effective/deterministic
-        # regardless of the currently installed packages we special-case some
+        # regardless of the currently installed packages, we special-case some
         # tools (NB. not package names) as their modules may not have been
         # imported by the `ComparatorManager().reload()` call above. (#908072)
         tools = set(



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/3cac0591767aa2a3ed86a27a0576f0ee27e44f36...a615cc31a6e6d767a388ad3e074fc828703419d8

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/3cac0591767aa2a3ed86a27a0576f0ee27e44f36...a615cc31a6e6d767a388ad3e074fc828703419d8
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/20201123/c0673e8c/attachment.htm>