[Catalyst-commits] r11679 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2009-10-28 23:54:56 +0000 (Wed, 28 Oct 2009)
New Revision: 11679

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Utils.pm
Log:
Enable Catalyst::Utils::home() to find home within Dist::Zilla built dists.

Courtesy of nperez.

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-10-28 02:06:19 UTC (rev 11678)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-10-28 23:54:56 UTC (rev 11679)
@@ -15,6 +15,8 @@
       switch off (deprecated) regex fallback for component resolution.
     - Added an nginx-specific behavior to the FastCGI engine to allow
       proper PATH_INFO and SCRIPT_NAME processing for non-root applications
+    - Enable Catalyst::Utils::home() to find home within Dist::Zilla built
+      distributions
 
 5.80013 2009-09-17 11:07:04
 

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Utils.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Utils.pm	2009-10-28 02:06:19 UTC (rev 11678)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Utils.pm	2009-10-28 23:54:56 UTC (rev 11679)
@@ -172,8 +172,9 @@
             # pop off /lib and /blib if they're there
             $home = $home->parent while $home =~ /b?lib$/;
 
-            # only return the dir if it has a Makefile.PL or Build.PL
-            if (-f $home->file("Makefile.PL") or -f $home->file("Build.PL")) {
+            # only return the dir if it has a Makefile.PL or Build.PL or dist.ini
+            if (-f $home->file("Makefile.PL") or -f $home->file("Build.PL")
+                or -f $home->file("dist.ini")) {
 
                 # clean up relative path:
                 # MyApp/script/.. -> MyApp