[Jifty-commit] r6597 - in jifty/trunk: lib/Jifty

[Jifty commits]

Author: alexmv
Date: Tue Mar 17 10:56:29 2009
New Revision: 6597

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

Log:
 r43236 at kohr-ah:  chmrr | 2009-03-17 09:57:14 -0400
 We always end up needing File::ShareDir, move it it compile time rather than runtime more than once


Modified: jifty/trunk/lib/Jifty/Util.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Util.pm	(original)
+++ jifty/trunk/lib/Jifty/Util.pm	Tue Mar 17 10:56:29 2009
@@ -14,6 +14,7 @@
 
 use Jifty ();
 use File::Spec ();
+use File::ShareDir ();
 use Cwd ();
 
 use vars qw/%ABSOLUTE_PATH $JIFTY_ROOT $SHARE_ROOT $APP_ROOT/;
@@ -109,7 +110,6 @@
         undef $SHARE_ROOT unless defined $SHARE_ROOT and -d $SHARE_ROOT and -d File::Spec->catdir($SHARE_ROOT,"web");
 
         # If that doesn't pass inspection, try File::ShareDir::dist_dir
-        Jifty::Util->require('File::ShareDir');
         $SHARE_ROOT ||= eval { File::Spec->rel2abs( File::ShareDir::dist_dir('Jifty') )};
         undef $SHARE_ROOT unless defined $SHARE_ROOT and -d $SHARE_ROOT and -d File::Spec->catdir($SHARE_ROOT,"web");
     }