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

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Tue Oct 3 11:39:35 EDT 2006


Author: nelhage
Date: Tue Oct  3 11:39:34 2006
New Revision: 2002

Modified:
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/YAML.pm

Log:
Upping YAML::Syck dependency to 0.71 and always using it for dumping
if available.

Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Tue Oct  3 11:39:34 2006
@@ -64,11 +64,11 @@
 
 if (can_cc()) {
     # Always require the Syck bindings if a C compiler is available
-    requires('YAML::Syck' => 0.45);
+    requires('YAML::Syck' => 0.71);
     requires('JSON::Syck' => 0.14);
 }
 else {
-    requires('YAML' => 0.35) unless can_use('YAML::Syck' => 0.45);
+    requires('YAML' => 0.35) unless can_use('YAML::Syck' => 0.71);
     requires('JSON' => 0.01) unless can_use('JSON::Syck' => 0.14);
 }
 

Modified: jifty/trunk/lib/Jifty/YAML.pm
==============================================================================
--- jifty/trunk/lib/Jifty/YAML.pm	(original)
+++ jifty/trunk/lib/Jifty/YAML.pm	Tue Oct  3 11:39:34 2006
@@ -19,13 +19,9 @@
     no strict 'refs';
     no warnings 'once';
 
-    if ( eval { require YAML::Syck; YAML::Syck->VERSION(0.27) } ) {
+    if ( eval { require YAML::Syck; YAML::Syck->VERSION(0.71) } ) {
         *Load     = *YAML::Syck::Load;
-
-        # XXX Force non-Syck Dump until we can figure out why
-        # YAML::Syck's dumps choke YAML.pm in some cases
-        require YAML;
-        *Dump     = *YAML::Dump;
+        *Dump     = *YAML::Syck::Dump;
 
         *LoadFile = *YAML::Syck::LoadFile;
         *DumpFile = *YAML::Syck::DumpFile;


More information about the Jifty-commit mailing list