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

? sunnavy sunnavy at bestpractical.com
Thu Jun 24 10:14:55 EDT 2010


The branch, master has been updated
       via  ab32ea94f3953234f5afcee204fcec8dffb337cf (commit)
      from  8284bce74e9c4691a59bf448a481dcffb0ff73f9 (commit)

Summary of changes:
 bin/shipwright-generate |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit ab32ea94f3953234f5afcee204fcec8dffb337cf
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jun 24 22:16:05 2010 +0800

    in case tar file path is relative

diff --git a/bin/shipwright-generate b/bin/shipwright-generate
index 4f3b198..379eed7 100755
--- a/bin/shipwright-generate
+++ b/bin/shipwright-generate
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Cwd;
 use File::Temp 'tempdir';
-use File::Spec::Functions 'catdir';
+use File::Spec::Functions 'catdir', 'catfile', 'file_name_is_absolute';
 use IPC::Run3;
 use File::Which 'which';
 my $cwd = getcwd;
@@ -48,6 +48,7 @@ for my $arg ( @ARGV ) {
     }
     elsif ( $found_tarfile ) {
         $tarfile = $arg;
+        $tarfile = catfile( $cwd, $tarfile ) unless file_name_is_absolute($tarfile);
         undef $found_tarfile;
         next;
     }

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



More information about the Bps-public-commit mailing list