[Jifty-commit] r6387 - in jifty/trunk: bin lib/Jifty

[Jifty commits]

Author: sartak
Date: Fri Feb 20 19:41:17 2009
New Revision: 6387

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

Log:
 r80336 at onn:  sartak | 2009-02-20 19:41:08 -0500
 Add a quiet flag to app_root for when we're creating a new application (jifty app)


Modified: jifty/trunk/bin/jifty
==============================================================================
--- jifty/trunk/bin/jifty	(original)
+++ jifty/trunk/bin/jifty	Fri Feb 20 19:41:17 2009
@@ -5,7 +5,7 @@
 
 BEGIN {
     Jifty::Util->require or die $UNIVERSAL::require::ERROR;
-    my $root = Jifty::Util->app_root;
+    my $root = Jifty::Util->app_root(quiet => 1);
     unshift @INC, "$root/lib" if ($root);
 }
 

Modified: jifty/trunk/lib/Jifty/Util.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Util.pm	(original)
+++ jifty/trunk/lib/Jifty/Util.pm	Fri Feb 20 19:41:17 2009
@@ -131,6 +131,7 @@
 
 sub app_root {
     my $self = shift;
+    my %args = @_;
 
     return $ENV{'JIFTY_APP_ROOT'} if ($ENV{'JIFTY_APP_ROOT'});
     return $APP_ROOT if ($APP_ROOT);
@@ -172,7 +173,7 @@
     }
     warn "Can't guess application root from current path ("
         . Cwd::cwd()
-        . ") or bin path ($FindBin::Bin)\n";
+        . ") or bin path ($FindBin::Bin)\n" unless $args{quiet};
     return ''; # returning undef causes tons of 'uninitialized...' warnings.
 }