[Jifty-commit] r5091 - in jifty/trunk: lib/Jifty
Jifty commits
jifty-commit at lists.jifty.org
Mon Feb 11 14:28:14 EST 2008
Author: alexmv
Date: Mon Feb 11 14:28:13 2008
New Revision: 5091
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/Util.pm
Log:
r27742 at zoq-fot-pik: chmrr | 2008-02-11 14:27:52 -0500
* catpath wants a file, or File::Spec::Unix carps about undef values
Modified: jifty/trunk/lib/Jifty/Util.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Util.pm (original)
+++ jifty/trunk/lib/Jifty/Util.pm Mon Feb 11 14:28:13 2008
@@ -151,7 +151,7 @@
my ($volume, $dirs) = File::Spec->splitpath($root_path, 'no_file');
my @root = File::Spec->splitdir($dirs);
while (@root) {
- my $try = File::Spec->catpath($volume, File::Spec->catdir( @root, "bin", "jifty" ));
+ my $try = File::Spec->catpath($volume, File::Spec->catdir( @root, "bin", "jifty" ), '');
if (# XXX: Just a quick hack
# MSWin32's 'maybe_command' sees only file extension.
# Maybe we should check 'jifty.bat' instead on Win32,
@@ -164,7 +164,7 @@
and lc($try) ne lc(File::Spec->catdir($Config::Config{bin}, "jifty"))
and lc($try) ne lc(File::Spec->catdir($Config::Config{scriptdir}, "jifty")) )
{
- return $APP_ROOT = File::Spec->catpath($volume, File::Spec->catdir(@root));
+ return $APP_ROOT = File::Spec->catpath($volume, File::Spec->catdir(@root), '');
}
pop @root;
}
More information about the Jifty-commit
mailing list