[107988] trunk/dports/_resources/port1.0/group/texlive-1.0.tcl

[dports at macports.org]

Revision: 107988
          https://trac.macports.org/changeset/107988
Author:   dports at macports.org
Date:     2013-07-09 21:20:53 -0700 (Tue, 09 Jul 2013)
Log Message:
-----------
texlive portgroup: prevent updmap failures from causing activation to
fail (#39690). We already do this for fmtutil.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/texlive-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/texlive-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/texlive-1.0.tcl	2013-07-10 04:09:20 UTC (rev 107987)
+++ trunk/dports/_resources/port1.0/group/texlive-1.0.tcl	2013-07-10 04:20:53 UTC (rev 107988)
@@ -437,10 +437,10 @@
             system "${prefix}/libexec/texlive-update-cnf language.dat.lua"
             system "${prefix}/libexec/texlive-update-cnf updmap.cfg"
             system "${prefix}/libexec/texlive-update-cnf fmtutil.cnf"
-            system "${prefix}/bin/updmap-sys"
-            # format generation might fail if we are in the middle of
+            # map/format generation might fail if we are in the middle of
             # a major upgrade and have not yet updated all texlive ports.
             # Catch the error to prevent the upgrade from failing.
+            catch {system "${prefix}/bin/updmap-sys"}
             catch {system "${prefix}/bin/fmtutil-sys --all"}
         } else {
             # Otherwise, only update the config files that are
@@ -453,7 +453,7 @@
             }
             if {${texlive.maps} != ""} {
                 system "${prefix}/libexec/texlive-update-cnf updmap.cfg"
-                system "${prefix}/bin/updmap-sys"
+                catch {system "${prefix}/bin/updmap-sys"}
             }
             if {${texlive.formats} != ""} {
                 system "${prefix}/libexec/texlive-update-cnf fmtutil.cnf"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130709/7cc9eb9b/attachment.html>