[Jifty-commit] r2856 - in jifty/trunk: lib/Jifty lib/Jifty/Script

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Tue Feb 27 18:01:56 2007
New Revision: 2856

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Script/Schema.pm
   jifty/trunk/lib/Jifty/Util.pm

Log:
 r17441 at zoq-fot-pik:  chmrr | 2007-02-27 18:01:50 -0500
  * Revert mistaken parts of that commit


Modified: jifty/trunk/lib/Jifty/Script/Schema.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Schema.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Schema.pm	Tue Feb 27 18:01:56 2007
@@ -500,7 +500,7 @@
 
     # Everything but the template1 database is assumed
     my %connect_args;
-    $connect_args{'database'} = 'template1' if ( $driver =~ /^Pg/ );
+    $connect_args{'database'} = 'template1' if ( $driver eq 'Pg' );
     $connect_args{'database'} = ''          if ( $driver eq 'mysql' );
     $handle->connect(%connect_args);
     return $handle;

Modified: jifty/trunk/lib/Jifty/Util.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Util.pm	(original)
+++ jifty/trunk/lib/Jifty/Util.pm	Tue Feb 27 18:01:56 2007
@@ -125,9 +125,6 @@
 It C<die>s if it can only find C</usr> or C</usr/local> which fit
 these criteria.
 
-If a C<JIFTY_APP_ROOT> environment variable is defined, it searches
-that path first.
-
 =cut
 
 sub app_root {
@@ -138,7 +135,6 @@
     
     my @roots;
 
-    push @roots, $ENV{JIFTY_APP_ROOT} if $ENV{JIFTY_APP_ROOT};
     push( @roots, Cwd::cwd() );
 
     eval { Jifty::Util->require('FindBin') };