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

[ryandesign at macports.org]

Revision: 58776
          http://trac.macports.org/changeset/58776
Author:   ryandesign at macports.org
Date:     2009-10-04 23:00:36 -0700 (Sun, 04 Oct 2009)
Log Message:
-----------
portutil.tcl: Add error message to merge proc if the directory it's called with doesn't contain directories named after the architectures to be merged

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

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2009-10-05 05:45:19 UTC (rev 58775)
+++ trunk/base/src/port1.0/portutil.tcl	2009-10-05 06:00:36 UTC (rev 58776)
@@ -2221,6 +2221,9 @@
             set base_arch ${arch}
         }
     }
+    if {"" == ${base_arch}} {
+        return -code error [format [msgcat::mc "Cannot merge because directory '%s' contains no architecture directories."] ${base}]
+    }
     ui_debug "merging architectures ${archs}, base_arch is ${base_arch}"
 
     # traverse the base-architecture directory
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091004/1983c812/attachment.html>