[Debian-tex-commits] SVN tex-common commit + diffs: r4417 - tex-common/branches/for-tl2008/debian

[Norbert Preining]

Author: preining
Date: 2009-12-03 13:31:25 +0000 (Thu, 03 Dec 2009)
New Revision: 4417

Modified:
   tex-common/branches/for-tl2008/debian/changelog
   tex-common/branches/for-tl2008/debian/postinst.in
Log:
postinst trigger action: run updmap sys action only if texlive-base
installed since otherwise updmap-sys will break


Modified: tex-common/branches/for-tl2008/debian/changelog
===================================================================
--- tex-common/branches/for-tl2008/debian/changelog	2009-12-03 10:08:29 UTC (rev 4416)
+++ tex-common/branches/for-tl2008/debian/changelog	2009-12-03 13:31:25 UTC (rev 4417)
@@ -1,9 +1,11 @@
-tex-common (2.01~1) experimental; urgency=low
+tex-common (2.01) experimental; urgency=low
 
   * Remove setting of MPXCOMMAND. MetaPost in TeXLive 2009 no longer needs
-    it, and is broken when it is set.
+    it, and is broken when it is set. [fk]
+  * postinst trigger action: run updmap sys action only if texlive-base
+    installed since otherwise updmap-sys will break
 
- -- Frank Küster <frank at debian.org>  Thu, 19 Nov 2009 22:32:15 +0100
+ -- Norbert Preining <preining at debian.org>  Thu, 03 Dec 2009 22:29:40 +0900
 
 tex-common (2.00) experimental; urgency=low
 

Modified: tex-common/branches/for-tl2008/debian/postinst.in
===================================================================
--- tex-common/branches/for-tl2008/debian/postinst.in	2009-12-03 10:08:29 UTC (rev 4416)
+++ tex-common/branches/for-tl2008/debian/postinst.in	2009-12-03 13:31:25 UTC (rev 4417)
@@ -119,24 +119,40 @@
          # code from postinst-tex
          if dhit_libkpathsea_configured; then
              if which updmap-sys >/dev/null; then
-                    tempfile=$(mktemp -p /tmp updmap.XXXXXXXX)
-                    printf "Running updmap-sys. This may take some time... "
-                    if updmap-sys > $tempfile 2>&1 ; then
-                        rm -f $tempfile
-                        echo "done."
+                    # 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 -f='${Status}' texlive-base)
+                    case "$stat" in
+                        "install ok install")
+                            do_it=1
+                            ;;
+                        *)
+                            do_it=0
+                            ;;
+                    esac
+                    if [ "$do_it" = 0 ] ; then
+                        echo "texlive-base is not ready, delaying updmap-sys call" >&2
                     else
-                        exec >&2
-                        echo
-                        echo "updmap-sys failed. Output has been stored in"
-                        echo "$tempfile"
-                        echo "Please include this file if you report a bug."
-                        echo
-                        echo "Sometimes, not accepting conffile updates in /etc/texmf/updmap.d"
-                        echo "causes updmap-sys to fail.  Please check for files with extension"
-                        echo ".dpkg-dist or .ucf-dist in this directory" 
-                        echo
-                        exit 1
-    	            fi
+                        tempfile=$(mktemp -p /tmp updmap.XXXXXXXX)
+                        printf "Running updmap-sys. This may take some time... "
+                        if updmap-sys > $tempfile 2>&1 ; then
+                            rm -f $tempfile
+                            echo "done."
+                        else
+                            exec >&2
+                            echo
+                            echo "updmap-sys failed. Output has been stored in"
+                            echo "$tempfile"
+                            echo "Please include this file if you report a bug."
+                            echo
+                            echo "Sometimes, not accepting conffile updates in /etc/texmf/updmap.d"
+                            echo "causes updmap-sys to fail.  Please check for files with extension"
+                            echo ".dpkg-dist or .ucf-dist in this directory" 
+                            echo
+                            exit 1
+    	                fi
+                    fi
                 fi
             fi
         ;;