[Jifty-commit] r6125 - in Net-Jifty/trunk: .

[Jifty commits]

Author: sartak
Date: Tue Dec 16 22:42:38 2008
New Revision: 6125

Modified:
   Net-Jifty/trunk/   (props changed)
   Net-Jifty/trunk/Makefile.PL
   Net-Jifty/trunk/lib/Net/Jifty.pm

Log:
 r77609 at onn:  sartak | 2008-12-16 22:42:33 -0500
 ...ditto Cwd


Modified: Net-Jifty/trunk/Makefile.PL
==============================================================================
--- Net-Jifty/trunk/Makefile.PL	(original)
+++ Net-Jifty/trunk/Makefile.PL	Tue Dec 16 22:42:38 2008
@@ -10,7 +10,6 @@
 requires        'Encode';
 requires        'Email::Address';
 requires        'Term::ReadKey';
-requires        'Cwd';
 
 build_requires  'Test::More';
 build_requires  'Test::MockObject';
@@ -24,6 +23,7 @@
         -default => 0,
         recommends('Hash::Merge'),
         recommends('Path::Class'),
+        recommends('Cwd'),
     ],
 );
 

Modified: Net-Jifty/trunk/lib/Net/Jifty.pm
==============================================================================
--- Net-Jifty/trunk/lib/Net/Jifty.pm	(original)
+++ Net-Jifty/trunk/lib/Net/Jifty.pm	Tue Dec 16 22:42:38 2008
@@ -13,8 +13,6 @@
 use Encode;
 use Fcntl qw(:mode);
 
-use Cwd;
-
 use Email::Address;
 
 has site => (
@@ -633,10 +631,11 @@
     my $all_config = {};
 
     require Path::Class;
-    my $dir = Path::Class::dir(shift || getcwd);
+    require Cwd;
+    my $dir = Path::Class::dir(shift || Cwd::getcwd());
 
     require Hash::Merge;
-    my $old_behavior = Hash::Merge::get_behavior;
+    my $old_behavior = Hash::Merge::get_behavior();
     Hash::Merge::set_behavior('RIGHT_PRECEDENT');
 
     while (1) {