[Debian-tex-commits] SVN tex-common commit + diffs: r4577 - tex-common/trunk/debian

[Norbert Preining]

Author: preining
Date: 2010-02-28 04:07:35 +0000 (Sun, 28 Feb 2010)
New Revision: 4577

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/postinst.in
Log:
tex-common
work around an under-specification of dpkg-query that makes the calls
to it in the configure script break configuration, and thus creates
FTBFS of unrelated packages (Closes: #571334)


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2010-02-24 19:39:52 UTC (rev 4576)
+++ tex-common/trunk/debian/changelog	2010-02-28 04:07:35 UTC (rev 4577)
@@ -1,11 +1,13 @@
-tex-common (2.07) unstable; urgency=low
+tex-common (2.07) unstable; urgency=high
 
-  * UNRELEASED
   * reword the language.{dat,def} trigger action's message to include
     the name of the base format (Closes: #566915)
   * convert some files to UTF8
+  * work around an under-specification of dpkg-query that makes the calls
+    to it in the configure script break configuration, and thus creates
+    FTBFS of unrelated packages (Closes: #571334)
 
- -- Norbert Preining <preining at debian.org>  Wed, 27 Jan 2010 09:08:46 +0900
+ -- Norbert Preining <preining at debian.org>  Sun, 28 Feb 2010 13:05:40 +0900
 
 tex-common (2.06) unstable; urgency=high
 

Modified: tex-common/trunk/debian/postinst.in
===================================================================
--- tex-common/trunk/debian/postinst.in	2010-02-24 19:39:52 UTC (rev 4576)
+++ tex-common/trunk/debian/postinst.in	2010-02-28 04:07:35 UTC (rev 4577)
@@ -122,7 +122,12 @@
                     # we also have to check that texlive-base is installed
                     # and configured, otherwise we cannot be sure that
                     # all necessary basic files are present
-                    stat=$(dpkg-query -W -f='${Status}' texlive-base)
+                    #
+                    # dpkg-query has two defects wrt not existing packages
+                    # - it is noisy to stderr
+                    # - it returns 1
+                    # so shut both errors up
+                    stat=$(dpkg-query -W -f='${Status}' texlive-base 2>/dev/null || true)
                     case "$stat" in
                         "install ok installed")
                             do_it=1
@@ -364,7 +369,8 @@
     # and configured, otherwise we cannot be sure that
     # all necessary basic files are present
     if dhit_libkpathsea_configured; then
-        stat=$(dpkg-query -W -f='${Status}' texlive-base)
+        # see above for information on dpkg-query usage
+        stat=$(dpkg-query -W -f='${Status}' texlive-base  2>/dev/null || true)
         case "$stat" in
         "install ok installed")
             do_it=1