[107960] trunk/base/src/port1.0/portutil.tcl

[cal at macports.org]

Revision: 107960
          https://trac.macports.org/changeset/107960
Author:   cal at macports.org
Date:     2013-07-09 15:44:41 -0700 (Tue, 09 Jul 2013)
Log Message:
-----------
tracelib: only consider lib and run dependencies for install and activate

Without this change, installing from a binary archive fails with trace mode
enabled, because the code will call registry_active on the build dependencies
(which might not be installed, causing the code to throw and the installation
to fail).

Modified Paths:
--------------
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2013-07-09 22:36:41 UTC (rev 107959)
+++ trunk/base/src/port1.0/portutil.tcl	2013-07-09 22:44:41 UTC (rev 107960)
@@ -1416,7 +1416,6 @@
 
                         test        -
                         destroot    -
-                        install     -
                         dmg         -
                         pkg         -
                         portpkg     -
@@ -1425,8 +1424,13 @@
                         srpm        -
                         dpkg        -
                         mdmg        -
+                        ""          { set deptypes "depends_fetch depends_extract depends_lib depends_build depends_run" }
+
+                        # install may be run given an archive, which means
+                        # depends_fetch, _extract, _build dependencies have
+                        # never been installed
                         activate    -
-                        ""          { set deptypes "depends_fetch depends_extract depends_lib depends_build depends_run" }
+                        install     { set deptypes "depends_lib depends_run" }
                     }
 
                     # Gather the dependencies for deptypes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130709/41076616/attachment.html>