[Bps-public-commit] Shipwright branch, master, updated. d4197e4944297aa2ebf79c6998838a7a77df906a

[? sunnavy]

The branch, master has been updated
       via  d4197e4944297aa2ebf79c6998838a7a77df906a (commit)
       via  b855cb8341f8fd51dcf684169a581ff33aeae8a9 (commit)
      from  302df288e9a51c3aff139d9873ac9ecc75f27c16 (commit)

Summary of changes:
 lib/Shipwright/Script/Import.pm | 2 +-
 lib/Shipwright/Script/Update.pm | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit b855cb8341f8fd51dcf684169a581ff33aeae8a9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Dec 7 15:11:52 2013 +0800

    typo

diff --git a/lib/Shipwright/Script/Import.pm b/lib/Shipwright/Script/Import.pm
index 2a41597..3f89f07 100644
--- a/lib/Shipwright/Script/Import.pm
+++ b/lib/Shipwright/Script/Import.pm
@@ -237,7 +237,7 @@ sub run {
 
             my $branches =
               load_yaml_file( $shipwright->source->branches_path );
-            $branches ||= {} if
+            $branches ||= {};
 
             $self->log->fatal( "importing $name" );
             $shipwright->backend->import(

commit d4197e4944297aa2ebf79c6998838a7a77df906a
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Dec 7 17:03:04 2013 +0800

    make a clean temporary source dir in case there is collsion
    
    sometimes multiple 'import' commands could result in buggy behavior, see #91220

diff --git a/lib/Shipwright/Script/Update.pm b/lib/Shipwright/Script/Update.pm
index f040368..14edb9c 100644
--- a/lib/Shipwright/Script/Update.pm
+++ b/lib/Shipwright/Script/Update.pm
@@ -192,6 +192,11 @@ sub run {
                     }
                 }
                 else {
+                    local $ENV{SHIPWRIGHT_SOURCE_ROOT} = tempdir(
+                        'shipwright_source_XXXXXX',
+                        CLEANUP => 1,
+                        TMPDIR  => 1
+                    );
                     system(
                             "$0 import -r " 
                           . $self->repository

-----------------------------------------------------------------------