[52082] branches/universal-sanity/base

[toby at macports.org]

Revision: 52082
          http://trac.macports.org/changeset/52082
Author:   toby at macports.org
Date:     2009-06-09 13:05:35 -0700 (Tue, 09 Jun 2009)
Log Message:
-----------
merge from trunk

Modified Paths:
--------------
    branches/universal-sanity/base/src/macports1.0/macports.tcl

Property Changed:
----------------
    branches/universal-sanity/base/


Property changes on: branches/universal-sanity/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:51872-52031
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:51872-52079
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/universal-sanity/base/src/macports1.0/macports.tcl
===================================================================
--- branches/universal-sanity/base/src/macports1.0/macports.tcl	2009-06-09 20:05:22 UTC (rev 52081)
+++ branches/universal-sanity/base/src/macports1.0/macports.tcl	2009-06-09 20:05:35 UTC (rev 52082)
@@ -2037,8 +2037,12 @@
         if {[info exists portinfo(porturl)]} {
             set porturl $portinfo(porturl)
         } else {
-            ui_error "Dependency '$dep_portname' not found."
-            return 1
+            if {$skipSatisfied && [registry::entry_exists_for_name $dep_portname]} {
+                ui_warn "Dependency '$dep_portname' is installed but not present in the index"
+            } else {
+                ui_error "Dependency '$dep_portname' not found."
+                return 1
+            }
         }
 
         # Is that dependency satisfied or this port installed?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090609/77172206/attachment.html>