[Bps-public-commit] r18522 - in Shipwright/trunk: lib/Shipwright/Script

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sun Feb 22 12:22:55 2009
New Revision: 18522

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Script/Import.pm

Log:
 r20043 at sunnavys-mb:  sunnavy | 2009-02-23 01:11:05 +0800
 don't set overwrite to 1 if it's already imported in the same run


Modified: Shipwright/trunk/lib/Shipwright/Script/Import.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Script/Import.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Script/Import.pm	Sun Feb 22 12:22:55 2009
@@ -204,7 +204,8 @@
             $shipwright->backend->import(
                 source  => $source,
                 comment => $self->comment || 'import ' . $source,
-                overwrite => 1,                # import anyway for the main dist
+# import anyway for the main dist, unless it's already imported in this run
+                overwrite => $imported{$name} ? 0 : 1, 
                 version   => $version->{$name},
                 as        => $self->as,
                 branches => $branches->{$name},
@@ -214,7 +215,7 @@
                 source       => $source,
                 comment      => 'import scripts for ' . $source,
                 build_script => $script_dir,
-                overwrite    => 1,
+                overwrite    => $imported{$name} ? 0 : 1,
             );
 
             # merge new map into map.yml in repo