Fix for tests

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Utils.pm

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index 306d1b8..6ba6f86 100644 (file)
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -202,12 +202,12 @@ sub home {
     }
 
     # we found nothing
-    return 0;
+    return;
 }
 
 =head2 find_home_unloaded_in_checkout ($path)
 
-Tries to determine if C<$path> (or cwd if not supplied)
+Tries to determine if C<$path> (or the current working directory if not supplied)
 looks like a checkout. Any leading lib, script or blib components
 will be removed, then the directory produced will be checked
 for the existence of a C<< dist_indicator_file_list() >>.
@@ -216,13 +216,13 @@ If one is found, the directory will be returned, otherwise false.
 
 =cut
 
+# XXX - Is this actually sane - should we just split into two simpler routines
+#       one for when we do have an @INC entry and one for when we don't?
 sub find_home_unloaded_in_checkout {
     my ($path) = @_;
     $path ||= cwd() if !defined $path || !length $path;
     my $home = dir($path)->absolute->cleanup;
-    # pop off /lib and /blib if they're there
-    # pop off /script if it's there.
-
+    my $last_home;
     do {
         # only return the dir if it has a Makefile.PL or Build.PL or dist.ini
         if (any { $_ } map { -f $home->file($_) } dist_indicator_file_list()) {
@@ -236,10 +236,11 @@ sub find_home_unloaded_in_checkout {
             }
             return $home->stringify;
         }
+        $last_home = $home;
         $home = $home->parent;
     }
     while # pop off /lib and /blib or /script or /t/ if they're there
-        ($home =~ /b?lib$/ || $home =~ /script$/ || $home =~ /\/t(\/|$)/);
+        ($last_home =~ /b?lib$/ || $last_home =~ /script$/ || $last_home =~ /\/t(\/|$)/);
 }
 
 =head2 prefix($class, $name);