mirrors
/
sanoid
mirror of https://github.com/jimsalterjrs/sanoid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

whoops - keep process_children_only from being set from blank value in defaults.conf

This commit is contained in:
Jim Salter 2015-04-02 11:24:00 -04:00
parent 470a16e480
commit 8a6048635a
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELIST
View File

@ -1,3 +1,5 @@
1.3.1 whoops - prevent process_children_only from getting set from blank value in defaults
1.3.0 changed monitor_children_only to process_children_only. which keeps sanoid from messing around with empty parent datasets at all. 1.3.0 changed monitor_children_only to process_children_only. which keeps sanoid from messing around with empty parent datasets at all.
also more thoroughly documented features in default config files. also more thoroughly documented features in default config files.

2
VERSION
View File

@ -1 +1 @@
1.3.0 1.3.1

4
sanoid
View File

@ -4,7 +4,7 @@
# from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE. # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
my $version = '1.2.0'; my $version = '1.3.1';
use strict; use strict;
use Config::IniFiles; # read samba-style conf file use Config::IniFiles; # read samba-style conf file
@ -555,7 +555,7 @@ sub init {
# set default values from %defaults, which can then be overriden by template # set default values from %defaults, which can then be overriden by template
# and/or local settings within the module. # and/or local settings within the module.
foreach my $key (keys %{$defaults{'template_default'}}) { foreach my $key (keys %{$defaults{'template_default'}}) {
if (! ($key =~ /template|recursive/)) { if (! ($key =~ /template|recursive|children_only/)) {
$config{$section}{$key} = $defaults{'template_default'}{$key}; $config{$section}{$key} = $defaults{'template_default'}{$key};
} }
} }

2
syncoid
View File

@ -4,7 +4,7 @@
# from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE. # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
my $version = '1.3.0'; my $version = '1.3.1';
use strict; use strict;
use Data::Dumper; use Data::Dumper;