[41527] trunk/base

[pguyot at kallisys.net]

Revision: 41527
          http://trac.macports.org/changeset/41527
Author:   pguyot at kallisys.net
Date:     2008-11-05 06:38:06 -0800 (Wed, 05 Nov 2008)
Log Message:
-----------
Fix switch statement (put comment before the statement) and add a test to check for that

Modified Paths:
--------------
    trunk/base/src/port1.0/portdepends.tcl
    trunk/base/tests/Makefile
    trunk/base/tests/test/dependencies-e/Portfile
    trunk/base/tests/test/dependencies-e/master

Added Paths:
-----------
    trunk/base/tests/test/dependencies-e/

Modified: trunk/base/src/port1.0/portdepends.tcl
===================================================================
--- trunk/base/src/port1.0/portdepends.tcl	2008-11-05 13:45:07 UTC (rev 41526)
+++ trunk/base/src/port1.0/portdepends.tcl	2008-11-05 14:38:06 UTC (rev 41527)
@@ -52,9 +52,9 @@
     switch $action {
 		set {
 			foreach depspec $value {
+			    # port syntax accepts colon-separated junk that we do not understand yet.
 				switch -regex $depspec {
 					^(lib|bin|path):([-A-Za-z0-9_/.${}^?+()|\\\\]+):([-._A-Za-z0-9]+)$ {}
-					# port syntax accepts colon-separated junk that we do not understand yet.
 					^(port)(:.+)?:([-._A-Za-z0-9]+)$ {}
 					default { return -code error [format [msgcat::mc "invalid depspec: %s"] $depspec] }
 				}

Modified: trunk/base/tests/Makefile
===================================================================
--- trunk/base/tests/Makefile	2008-11-05 13:45:07 UTC (rev 41526)
+++ trunk/base/tests/Makefile	2008-11-05 14:38:06 UTC (rev 41527)
@@ -1,6 +1,6 @@
 include ../Mk/macports.autoconf.mk
 
-TESTS?=checksums-1 cvs-and-patchsites envvariables site-tags trace universal universal-2 xcodeversion dependencies-c case-insensitive-deactivate variants
+TESTS?=checksums-1 cvs-and-patchsites envvariables site-tags trace universal universal-2 xcodeversion dependencies-c dependencies-d dependencies-e case-insensitive-deactivate variants
 
 PWD=$(shell pwd)
 

Modified: trunk/base/tests/test/dependencies-e/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-d/Portfile	2008-11-05 13:45:07 UTC (rev 41526)
+++ trunk/base/tests/test/dependencies-e/Portfile	2008-11-05 14:38:06 UTC (rev 41527)
@@ -1,7 +1,7 @@
 # $Id$
 
 PortSystem 1.0
-name		dependencies-d
+name		dependencies-e
 version		1
 categories	test
 maintainers	pguyot at kallisys.net
@@ -20,14 +20,13 @@
 	system "touch ${destroot}${prefix}/lib/${name}"
 }
 
-# Check that macports doesn't chunk on this junk.
-# This might mean this port depends on port dependencies-a without variant
-# i_want_b (which is a default variant).
-depends_lib	port:-i_want_b:dependencies-a
+depends_build \
+    port:docbook-xml-4.1.2 \
+    port:docbook-xml-4.2 \
+    port:docbook-xml-4.3 \
+    port:docbook-xml-4.4 \
+    port:docbook-xml-4.5
 
-# Check that macports doesn't chunk on this junk, but just generates a warning.
-depends {configure {dependencies-a +i_want_b >= 1}}
-
 test {
 # testing consists in processing dependencies
 }

Modified: trunk/base/tests/test/dependencies-e/master
===================================================================
--- trunk/base/tests/test/dependencies-d/master	2008-11-05 13:45:07 UTC (rev 41526)
+++ trunk/base/tests/test/dependencies-e/master	2008-11-05 14:38:06 UTC (rev 41527)
@@ -1,26 +1,2 @@
-Warning: depends option is not handled yet
-Warning: depends option is not handled yet
---->  Fetching dependencies-b
---->  Verifying checksum(s) for dependencies-b
---->  Extracting dependencies-b
---->  Configuring dependencies-b
---->  Building dependencies-b
---->  Staging dependencies-b into destroot
---->  Installing dependencies-b @1_0
---->  Activating dependencies-b @1_0
---->  Cleaning dependencies-b
---->  Fetching dependencies-a
---->  Verifying checksum(s) for dependencies-a
---->  Extracting dependencies-a
---->  Configuring dependencies-a
---->  Building dependencies-a
---->  Staging dependencies-a into destroot
---->  Installing dependencies-a @1_0+i_want_b
---->  Activating dependencies-a @1_0+i_want_b
---->  Cleaning dependencies-a
---->  Fetching dependencies-d
---->  Verifying checksum(s) for dependencies-d
---->  Extracting dependencies-d
---->  Configuring dependencies-d
---->  Building dependencies-d
---->  Testing dependencies-d
+Error: Dependency 'docbook-xml-4.1.2' not found.
+Error: Status 1 encountered during processing.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081105/039b19bb/attachment.html>