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

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  9befbcc2f623bf8a1fa40cf2c2ef2b9ea1f68b65 (commit)
       via  646a4c9ac12ee237fcbd62e4a907c8db787cf461 (commit)
       via  b0daf8fcc694e3cc1c4e453d9440a27ff7d16c03 (commit)
       via  ce9848968ed4a272fc1e334d87b6b877e33469db (commit)
       via  e36145d59de817178a9221a4ed453f438e7004ce (commit)
      from  21df52b7b88605bfaccb46567f2acc00d260649f (commit)

Summary of changes:
 lib/Shipwright/Manual/CustomizeBuild.pod |    4 ++--
 lib/Shipwright/Source/CPAN.pm            |    8 +++++---
 share/bin/shipwright-builder             |    4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit e36145d59de817178a9221a4ed453f438e7004ce
Author: Robert Buels <rmb32 at cornell.edu>
Date:   Wed Sep 16 18:42:06 2009 -0700

    squashed warning, fixed failed tempdir deletion in case where a listed CPAN dependency cannot be found on CPAN

diff --git a/lib/Shipwright/Source/CPAN.pm b/lib/Shipwright/Source/CPAN.pm
index fba1242..6406249 100644
--- a/lib/Shipwright/Source/CPAN.pm
+++ b/lib/Shipwright/Source/CPAN.pm
@@ -3,7 +3,7 @@ package Shipwright::Source::CPAN;
 use warnings;
 use strict;
 use Carp;
-use File::Spec::Functions qw/catfile catdir/;
+use File::Spec::Functions qw/catfile catdir rootdir/;
 use Shipwright::Source::Compressed;
 use CPAN;
 use Data::Dumper;
@@ -82,7 +82,7 @@ sub run {
     $self->log->info( "prepare to run source: " . $self->source );
 
     my $result = $self->_run;
-    if ( $result == 1) { 
+    if ( $result && $result == 1) {
         my $compressed =
           Shipwright::Source::Compressed->new( %$self, _no_update_url => 1 );
         $compressed->run(@_);
@@ -92,8 +92,10 @@ sub run {
         if ( $self->version ) {
             $error .= ' version ' . $self->version;
         }
-       
         $error .= ' in your CPAN mirror(s)' . " [@{$CPAN::Config->{urllist}}].";
+        chdir rootdir(); #< chdir to root dir in case CPAN has chdir'd
+                         #into one of the temp dirs, preventing its
+                         #deletion
         confess $error;
     } else {
             $self->log->warn("Removing source ".$self->source);

commit ce9848968ed4a272fc1e334d87b6b877e33469db
Author: Robert Buels <rmb32 at cornell.edu>
Date:   Wed Sep 16 21:59:34 2009 -0700

    fixed typo

diff --git a/share/bin/shipwright-builder b/share/bin/shipwright-builder
index 53ab072..30db928 100755
--- a/share/bin/shipwright-builder
+++ b/share/bin/shipwright-builder
@@ -267,7 +267,7 @@ else {
         install();
     }
     else {
-        print "all dists are intalled already\n";
+        print "all dists are installed already\n";
     }
 }
 

commit b0daf8fcc694e3cc1c4e453d9440a27ff7d16c03
Author: Robert Buels <rmb32 at cornell.edu>
Date:   Fri Sep 18 18:49:47 2009 -0700

    small docpatch to Shipwright::Manual::CustomizeBuild pod

diff --git a/lib/Shipwright/Manual/CustomizeBuild.pod b/lib/Shipwright/Manual/CustomizeBuild.pod
index 15b96c3..2b95b20 100644
--- a/lib/Shipwright/Manual/CustomizeBuild.pod
+++ b/lib/Shipwright/Manual/CustomizeBuild.pod
@@ -61,8 +61,8 @@ In a normal build script, the following types of commands are specified:
 configure, make, install, clean, and sometimes test. Their functions should be
 self-explanatory for anyone familiar with building perl modules.
 
-Three template substitutions are available for use in the command:
-%%PERL%%, %%PERL_ARCHNAME%%, %%INSTALL_BASE%% and %%MAKE%%.
+Four template substitutions are available for use in the command:
+C<%%PERL%%>, C<%%PERL_ARCHNAME%%>, C<%%INSTALL_BASE%%> and C<%%MAKE%%>.
 These can be used in cases where the path to perl, the perl archname (e.g.
 'i486-linux-gnu-thread-multi'), the base install path or make command 
 are needed, since they are not known beforehand or need to choose one later.

commit 646a4c9ac12ee237fcbd62e4a907c8db787cf461
Author: Robert Buels <rmb32 at cornell.edu>
Date:   Tue Sep 22 10:11:57 2009 -0700

    squashed undef warning

diff --git a/share/bin/shipwright-builder b/share/bin/shipwright-builder
index 30db928..77a56ec 100755
--- a/share/bin/shipwright-builder
+++ b/share/bin/shipwright-builder
@@ -591,7 +591,7 @@ sub wrap_bin {
         if ( -T $file ) {
             open my $fh, '<', $file or confess "can't open $file: $!";
             my $shebang = <$fh>;
-            if (
+            if ( defined($shebang) &&
                 $shebang =~ m{
 \Q$args{'install-base'}\E(?:/|\\)(?:s?bin)(?:/|\\)(\w+)
 |\benv\s+(\w+)

commit 9befbcc2f623bf8a1fa40cf2c2ef2b9ea1f68b65
Merge: 21df52b 646a4c9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Sep 26 09:40:14 2009 +0800

    Merge branch 'master' of git://github.com/rbuels/shipwright


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