[Git][reproducible-builds/diffoscope][master] 7 commits: draft an initial changelog.
Mattia Rizzolo
gitlab at salsa.debian.org
Sun Jul 8 19:59:36 CEST 2018
Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope
Commits:
27c0a65b by Mattia Rizzolo at 2018-07-08T18:22:54+02:00
draft an initial changelog.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
4d096dda by Mattia Rizzolo at 2018-07-08T18:26:08+02:00
main: be sure to print 'Keyboard Interrupt' if that happens.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
4761491c by Mattia Rizzolo at 2018-07-08T18:42:41+02:00
d/control: Bump Standards-Version to 4.1.5, no changes needed.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
262ee748 by Mattia Rizzolo at 2018-07-08T19:38:36+02:00
external_tools: fix package name, s/xmlutils/xlbeans/.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
3c05e568 by Mattia Rizzolo at 2018-07-08T19:38:55+02:00
d/control: Add Build-Dependency on procyon-decompiler, to run the tests.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
84245ae8 by Mattia Rizzolo at 2018-07-08T19:40:52+02:00
d/tests: symlink the test file instead of using Test-Commands
this leads to a nicer output in autopkgtest, where Test-Commands are
more obscure
Gbp-Dch: Ignore
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
58ec1c72 by Mattia Rizzolo at 2018-07-08T19:42:37+02:00
d/tests: autogenerate d/tests/control with all the recommends listed as dependencies, so the test is appropriately triggered whenever one of those packages change
Closes: #902920
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/rules
- debian/tests/control
- + debian/tests/control.in
- + debian/tests/pytest-with-recommends
- diffoscope/external_tools.py
- diffoscope/main.py
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,37 @@
diffoscope (99) UNRELEASED; urgency=medium
- * WIP
+ [ Xavier Briand ]
+ * Add lz4 comparator. Closes: #901548; !4
+
+ [ Paul Wise ]
+ * Clear the progress bar after completion. Closes: #901758
+ Handle terminals that do not support erasing the line by filling the
+ terminal with spaces. Ignore output devices that are not terminals.
+ * Do not delete the current terminal line for every progress bar update.
+ The erasure was also causing the progress bar to flicker.
+
+ [ Mattia Rizzolo ]
+ * Add a gitlab CI script. !8
+ * tempfiles:
+ + Set the base directory only if the caller didn't specify one already.
+ + Do not append '_diffoscope' to the temporary file names, as they are now
+ all in their namespaced directory already.
+ + Empty the list of known tempfiles after removing them. Closes: #902709
+ * tests/test_tools: fix test if /sbin contains a directory. MR: !2
+ Thanks to Chris Lamb <lamby at debian.org> for the patch.
+ * logging:
+ + Move the computation of the terminal line eraser into logging.py
+ + Always clean the line before printing a log message
+ * main:
+ + Clean the terminal line before printing a traceback.
+ * comparators:
+ + Do not shadow the original import errors. MR: !7
+
+ [ anthraxx ]
+ * comparators.utils:libarchive:
+ + Add compatibility code for python-libarchive >= 2.8. MR: !6
- -- Chris Lamb <lamby at debian.org> Fri, 29 Jun 2018 08:20:42 +0100
+ -- Mattia Rizzolo <mattia at debian.org> Sun, 08 Jul 2018 18:07:55 +0200
diffoscope (98) unstable; urgency=medium
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -48,6 +48,7 @@ Build-Depends:
openssh-client <!nocheck>,
pgpdump <!nocheck>,
poppler-utils <!nocheck>,
+ procyon-decompiler <!nocheck>,
python-argcomplete,
python3-all,
python3-binwalk <!nocheck>,
@@ -74,7 +75,7 @@ Build-Depends:
unzip <!nocheck>,
xmlbeans <!nocheck>,
xxd <!nocheck> | vim-common <!nocheck>,
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
Rules-Requires-Root: no
Homepage: https://diffoscope.org
Vcs-Git: https://salsa.debian.org/reproducible-builds/diffoscope.git
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -76,3 +76,22 @@ diffoscope/presenters/icon.py: favicon.png
favicon.png: logo.svg
inkscape -w 32 -h 32 -e $@ $<
+
+override_dh_clean:
+ dh_auto_clean
+ @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.in >> debian/tests/control.tmp
+ @sed -i "s#%RECOMMENDS%#$(shell bin/diffoscope --list-debian-substvars | cut -d= -f2)#" debian/tests/control.tmp
+ @set -e ; if ! diff -q debian/tests/control debian/tests/control.tmp ; then \
+ echo ;\
+ echo "The generated control file differs from the actual one." ;\
+ echo "A sourceful upload of this package is needed." ;\
+ echo ;\
+ echo "Differences:" ;\
+ diff -u debian/tests/control debian/tests/control.tmp ;\
+ else \
+ rm debian/tests/control.tmp ;\
+ fi
=====================================
debian/tests/control
=====================================
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,10 +1,11 @@
-Tests: pytest
-Depends: diffoscope, python3-pytest
-Restrictions: needs-recommends
+# DON'T MANUALLY MODIFY!
+# EDIT debian/tests/control.in INSTEAD!
+#
+Tests: pytest-with-recommends
+Depends: diffoscope, python3-pytest, abootimg, acl, apktool, binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, fontforge-extras, fp-utils, genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4, mono-utils, odt2txt, oggvideotools, openssh-client, pgpdump, poppler-utils, procyon-decompiler, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils
-Test-Command: debian/tests/pytest
+Tests: pytest
Depends: diffoscope, python3-pytest
-# but without Recommends
Tests: basic-command-line
Depends: diffoscope
=====================================
debian/tests/control.in
=====================================
--- /dev/null
+++ b/debian/tests/control.in
@@ -0,0 +1,10 @@
+Tests: pytest-with-recommends
+Depends: diffoscope, python3-pytest, %RECOMMENDS%
+
+Tests: pytest
+Depends: diffoscope, python3-pytest
+
+Tests: basic-command-line
+Depends: diffoscope
+Restrictions: allow-stderr
+# without Recommends
=====================================
debian/tests/pytest-with-recommends
=====================================
--- /dev/null
+++ b/debian/tests/pytest-with-recommends
@@ -0,0 +1 @@
+pytest
\ No newline at end of file
=====================================
diffoscope/external_tools.py
=====================================
--- a/diffoscope/external_tools.py
+++ b/diffoscope/external_tools.py
@@ -268,7 +268,7 @@ EXTERNAL_TOOLS = {
'debian': 'procyon-decompiler',
},
'dumpxsb': {
- 'debian': 'xmlutils',
+ 'debian': 'xmlbeans',
},
}
=====================================
diffoscope/main.py
=====================================
--- a/diffoscope/main.py
+++ b/diffoscope/main.py
@@ -459,7 +459,7 @@ def main(args=None):
post_parse(parsed_args)
sys.exit(run_diffoscope(parsed_args))
except KeyboardInterrupt:
- logger.info('Keyboard Interrupt')
+ logger.error('Keyboard Interrupt')
sys.exit(2)
except BrokenPipeError:
sys.exit(2)
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/5ed8e48bbb175e686f74e4a1d849986a52bec926...58ec1c721ebcfee320dac632ce8d3762f6bb9070
--
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/5ed8e48bbb175e686f74e4a1d849986a52bec926...58ec1c721ebcfee320dac632ce8d3762f6bb9070
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/20180708/20cfeb18/attachment.html>
More information about the rb-commits
mailing list