[Jifty-commit] r7131 - jifty/trunk/lib/Jifty/Plugin/Config/Action

Jifty commits jifty-commit at lists.jifty.org
Mon Jun 1 17:02:33 EDT 2009


Author: sartak
Date: Mon Jun  1 17:02:33 2009
New Revision: 7131

Modified:
   jifty/trunk/lib/Jifty/Plugin/Config/Action/AddConfig.pm

Log:
Only use the existing config if it actually exists

Modified: jifty/trunk/lib/Jifty/Plugin/Config/Action/AddConfig.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Config/Action/AddConfig.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Config/Action/AddConfig.pm	Mon Jun  1 17:02:33 2009
@@ -48,7 +48,7 @@
              . '/'
              . $self->argument_value('target_file');
 
-    my $existing_config = Jifty::YAML::LoadFile($file);
+    my $existing_config = -r $file ? Jifty::YAML::LoadFile($file) : {};
 
     Hash::Merge::set_behavior('RIGHT_PRECEDENT');
     my $combined_config = merge($existing_config, $new_config);


More information about the Jifty-commit mailing list