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

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Thu Apr  6 15:43:20 2006
New Revision: 819

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

Log:
 r12170 at zoq-fot-pik:  chmrr | 2006-04-06 15:43:05 -0400
  * YAML::Syck::Dump isn't quite all there yet; it doesn't handle
 circular references


Modified: jifty/trunk/lib/Jifty/YAML.pm
==============================================================================
--- jifty/trunk/lib/Jifty/YAML.pm	(original)
+++ jifty/trunk/lib/Jifty/YAML.pm	Thu Apr  6 15:43:20 2006
@@ -18,16 +18,22 @@
     local $@;
     no strict 'refs';
     no warnings 'once';
-    if (eval { require YAML::Syck; $YAML::Syck::VERSION >= 0.27 }) {
-        *Load = *YAML::Syck::Load;
-        *Dump = *YAML::Syck::Dump;
+
+    if ( eval { require YAML::Syck; $YAML::Syck::VERSION >= 0.27 } ) {
+        *Load     = *YAML::Syck::Load;
+
+        # XXX Force non-Syck Dump until it can handle dumping circular
+        # references, which show up in halos while dumping component
+        # arguments
+        require YAML;
+        *Dump     = *YAML::Dump;
+
         *LoadFile = *YAML::Syck::LoadFile;
         *DumpFile = *YAML::Syck::DumpFile;
-    }
-    else {
+    } else {
         require YAML;
-        *Load = *YAML::Load;
-        *Dump = *YAML::Dump;
+        *Load     = *YAML::Load;
+        *Dump     = *YAML::Dump;
         *LoadFile = *YAML::LoadFile;
         *DumpFile = *YAML::DumpFile;
     }