[med-svn] [Git][med-team/libzstd][master] 3 commits: Add patch fixing zstdgrep exit code when operating on files, Closes #918390

[Alexandre Mestiashvili]

Alexandre Mestiashvili pushed to branch master at Debian Med / libzstd


Commits:
d64e4eb7 by Alexandre Mestiashvili at 2019-01-05T22:19:17Z
Add patch fixing zstdgrep exit code when operating on files, Closes #918390

- - - - -
1b2c3212 by Alexandre Mestiashvili at 2019-01-05T22:57:00Z
Update changelog

Gbp-Dch: Ignore

- - - - -
33df2152 by Alexandre Mestiashvili at 2019-01-08T11:35:08Z
Add attribution for the patch

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0016-fix-zstdgrep-exit-code.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libzstd (1.3.8+dfsg-3) unstable; urgency=medium
+
+  * Add patch fixing zstdgrep exit code when operating on files
+    Closes: #918390, thanks to Jörg-Volker Peetz <jvpeetz at web.de>
+
+ -- Alexandre Mestiashvili <mestia at debian.org>  Sat, 05 Jan 2019 23:42:20 +0100
+
 libzstd (1.3.8+dfsg-2) unstable; urgency=medium
 
   * Add patch skipping tests failing on GNU/Hurd when writing to special files


=====================================
debian/patches/0016-fix-zstdgrep-exit-code.patch
=====================================
@@ -0,0 +1,23 @@
+Description: Fix zstdgrep exit code when operating on files
+From: Jörg-Volker Peetz <jvpeetz at web.de>
+Forwarded: https://github.com/facebook/zstd/issues/1428
+--- libzstd.orig/programs/zstdgrep
++++ libzstd/programs/zstdgrep
+@@ -113,16 +113,11 @@
+     if [ "${silent}" -lt 1 ] && [ "$#" -gt 1 ]; then
+         grep_args="-H ${grep_args}"
+     fi
+-    CUR_EXIT_CODE=0
+-    EXIT_CODE=1
+     set -f
+     while [ "$#" -gt 0 ]; do
+         # shellcheck disable=SC2086
+         "${zcat}" -fq -- "$1" | "${grep}" --label="${1}" ${grep_args} -- "${pattern}" -
+-        CUR_EXIT_CODE=$?
+-        if [ "${CUR_EXIT_CODE}" -eq 0 ] && [ "${EXIT_CODE}" -ne 1 ]; then
+-            EXIT_CODE=0
+-        fi
++        [ "$?" -ne 0 ] && EXIT_CODE=1
+         shift
+     done
+     set +f


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@
 0013-skip-memory-greedy-tests.patch
 0014-Reproducible-build.patch
 0015-Skip-dev-random-tests-on-hurd.patch
+0016-fix-zstdgrep-exit-code.patch



View it on GitLab: https://salsa.debian.org/med-team/libzstd/compare/f1b183b5aec6e00177a13a703b6a532cb1f6a0b2...33df2152e751f67cf45596788626f2fc5a2a9be6

-- 
View it on GitLab: https://salsa.debian.org/med-team/libzstd/compare/f1b183b5aec6e00177a13a703b6a532cb1f6a0b2...33df2152e751f67cf45596788626f2fc5a2a9be6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190111/c326eff3/attachment-0001.html>