[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.467,1.468
Status: Beta
Brought to you by:
kwilliams
|
From: Randy W. S. <si...@us...> - 2005-07-28 06:19:51
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3079/lib/Module/Build Modified Files: Base.pm Log Message: Silence warnings when the $path passed to _prefixify() is undefined or empty. Index: Base.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v retrieving revision 1.467 retrieving revision 1.468 diff -u -d -r1.467 -r1.468 --- Base.pm 28 Jul 2005 03:45:43 -0000 1.467 +++ Base.pm 28 Jul 2005 06:19:43 -0000 1.468 @@ -2865,13 +2865,14 @@ # Translated from ExtUtils::MM_Unix::prefixify() sub _prefixify { my($self, $path, $sprefix, $type) = @_; + my $rprefix = $self->prefix; - $rprefix .= '/' if $sprefix =~ m|/$|; - - $self->log_verbose(" prefixify $path from $sprefix to $rprefix\n"); - - if( length $path == 0 ) { + + $self->log_verbose(" prefixify $path from $sprefix to $rprefix\n") + if defined( $path ) && length( $path ); + + if( !defined( $path ) || ( length( $path ) == 0 ) ) { $self->log_verbose(" no path to prefixify, falling back to default.\n"); return $self->_prefixify_default( $type, $rprefix ); } elsif( !File::Spec->file_name_is_absolute($path) ) { @@ -2882,7 +2883,7 @@ $self->log_verbose(" cannot prefixify, falling back to default.\n"); return $self->_prefixify_default( $type, $rprefix ); } - + $self->log_verbose(" now $path in $rprefix\n"); return $path; |