[Bps-public-commit] r18371 - Shipwright/trunk/share/bin

[jesse at bestpractical.com]

Author: jesse
Date: Fri Feb 13 13:30:07 2009
New Revision: 18371

Modified:
   Shipwright/trunk/share/bin/shipwright-builder

Log:
* make builder work with newstyle builder archives with only a 'vendor' branch

Modified: Shipwright/trunk/share/bin/shipwright-builder
==============================================================================
--- Shipwright/trunk/share/bin/shipwright-builder	(original)
+++ Shipwright/trunk/share/bin/shipwright-builder	Fri Feb 13 13:30:07 2009
@@ -324,7 +324,14 @@
     else {
         if ($branches) {
             my $branch = $args{branches}{$dir} || $branches->{$dir}[0];
-            system( "cp -r "
+            # If no branch is specified but the vendor dir is there, 
+            # assume we should use it 
+            # XXX TODO - this will fail on old shipwright sources 
+            # which have a vendor directory inside the dist.
+            if (!$branch  &&     -d  catdir( 'sources', $dir,  'vendor' ) {
+                        $branch = 'vendor';
+            }  
+           system( "cp -r "
                   . catdir( 'sources', $dir, split /\//, $branch )
                   . ' '
                   . catdir( 'dists', $dir ) )