[subversion-commit] SVN tex-common commit + diffs: r928 - tex-common/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-02-23 17:44:32 +0000 (Thu, 23 Feb 2006)
New Revision: 928

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/postinst.functions
   tex-common/trunk/debian/postinst.in
Log:
* Perform all config checks in the postinst script instead of exiting
  after the first failure


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-02-23 17:43:07 UTC (rev 927)
+++ tex-common/trunk/debian/changelog	2006-02-23 17:44:32 UTC (rev 928)
@@ -1,3 +1,10 @@
+tex-common (0.17.1) UNRELEASED; urgency=low
+
+  * Perform all config checks in the postinst script instead of exiting
+    after the first failure
+
+ -- Frank Küster <frank at debian.org>  Thu, 23 Feb 2006 18:45:44 +0100
+
 tex-common (0.17) unstable; urgency=low
 
   * Restore the previous behavior by making the subdirectories of

Modified: tex-common/trunk/debian/postinst.functions
===================================================================
--- tex-common/trunk/debian/postinst.functions	2006-02-23 17:43:07 UTC (rev 927)
+++ tex-common/trunk/debian/postinst.functions	2006-02-23 17:44:32 UTC (rev 928)
@@ -40,7 +40,7 @@
     echo "should be available as ${file}.dpkg-dist"
     echo
     echo "Exiting."
-    failed=true
+    checkfailed=true
   else
     if ! echo "$line" | egrep -q "$pattern"; then
       echo
@@ -51,7 +51,7 @@
       echo "files.  The version of $file that is provided by the package"
       echo "should be available as ${file}.dpkg-dist"
       echo
-      failed=true
+      checkfailed=true
     fi
     if [ "$variable" = TEXFONTMAPS ]; then
     # the following is for backwards compatibility; must be dropped once all 
@@ -65,15 +65,10 @@
 	echo "files.  The version of $file that is provided by the package"
 	echo "should be available as ${file}.dpkg-dist"
 	echo
-	failed=true
+	checkfailed=true
       fi
     fi
   fi
-  if [ "$failed" = "true" ]; then
-    echo "Exiting."
-    exit 1
-  fi
-  
 }
 
 #################################################################

Modified: tex-common/trunk/debian/postinst.in
===================================================================
--- tex-common/trunk/debian/postinst.in	2006-02-23 17:43:07 UTC (rev 927)
+++ tex-common/trunk/debian/postinst.in	2006-02-23 17:44:32 UTC (rev 928)
@@ -90,6 +90,7 @@
 
     update-texmf
 # Now we check for some essential settings
+    checkfailed=false
     check_texmf /etc/texmf/texmf.d/55Fonts.cnf TEXFONTMAPS '.TEXMF/{fonts/,}map//;.TEXMF/dvips//'
     check_texmf /etc/texmf/texmf.cnf TEXFONTMAPS '.TEXMF/{fonts/,}map//;.TEXMF/dvips//'
     check_texmf /etc/texmf/texmf.d/05TeXMF.cnf TEXMFMAIN '/usr/share/texmf'
@@ -107,6 +108,10 @@
     check_texmf /etc/texmf/texmf.d/05TeXMF.cnf 'TEXMF( |=)' TEXMFDIST
     check_texmf /etc/texmf/texmf.cnf 'TEXMF( |=)' TEXMFDIST
 
+    if [ $checkfailed = true ]; then
+      exit 1
+    fi
+
 # run our scripts - this way we ensure that the generated files are
 # corrected, should one of the scripts have produced buggy output in 
 # a prior version