[texinfo] 01/01: cherrypick upstream svn 7031: fix texi2dvi premature exitus
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texinfo.
commit e4ad12f5b5fdd57cb5d47b909531dce603895b71
Author: Norbert Preining <preining@debian.org>
Date: Fri Feb 26 22:16:13 2016 +0900
cherrypick upstream svn 7031: fix texi2dvi premature exitus
---
debian/changelog | 6 ++++++
debian/patches/series | 1 +
debian/patches/upstream-svn7031-texi2dvi-fix | 22 ++++++++++++++++++++++
3 files changed, 29 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 28f2e20..3f6a6bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+texinfo (6.1.0.dfsg.1-4) unstable; urgency=medium
+
+ * cherrypick upstream svn 7031: fix texi2dvi premature exitus
+
+ -- Norbert Preining <preining@debian.org> Fri, 26 Feb 2016 22:14:44 +0900
+
texinfo (6.1.0.dfsg.1-3) unstable; urgency=medium
* cherrypick upstream svn 7022: fix missing output when doing
diff --git a/debian/patches/series b/debian/patches/series
index 110f54f..6e9fe7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ info-manpage-mentiones-nonfree
upstream-svn7021-fix-parsing
upstream-svn7022-fix-ouput
upstream-svn7027-remove-debug-statement
+upstream-svn7031-texi2dvi-fix
diff --git a/debian/patches/upstream-svn7031-texi2dvi-fix b/debian/patches/upstream-svn7031-texi2dvi-fix
new file mode 100644
index 0000000..4f6cc1f
--- /dev/null
+++ b/debian/patches/upstream-svn7031-texi2dvi-fix
@@ -0,0 +1,22 @@
+upstream svn7031 fix for texi2dvi not rebuilding properly
+ * util/texi2dvi (filter_files): Ensure that this function does not
+ make any non zero return status when the list of new xref files is
+ empty. Otherwise that causes a prematurate exit of calling
+ function, notably run_index. Remember texi2dvi is running under
+ set -e regime.
+---
+ util/texi2dvi | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- texinfo.orig/util/texi2dvi
++++ texinfo/util/texi2dvi
+@@ -988,7 +988,8 @@
+ # that match PREDICATE.
+ filter_files ()
+ {
+- test -n "$xref_files_new" && echo "$xref_files_new" |
++ test -n "$xref_files_new" || return 0
++ echo "$xref_files_new" |
+ # Filter existing files matching the criterion.
+ #
+ while read file; do
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texinfo.git
Reply to: