File tree 2 files changed +6
-2
lines changed 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ class { 'mysql::server': }
82
82
83
83
it {
84
84
is_expected . to contain_file ( 'mysqlbackup.sh' ) . with_content (
85
- %r{grep -v.* information_schema} ,
85
+ %r{information_schema} ,
86
86
)
87
87
}
88
88
end
Original file line number Diff line number Diff line change @@ -81,7 +81,11 @@ cleanup
81
81
<% end -%>
82
82
<% if @backupdatabases . empty? -%>
83
83
<% if @file_per_database -%>
84
- mysql --defaults-extra-file=$TMPFILE -s -r -N -e 'SHOW DATABASES' <% if ! @excludedatabases . empty? %> | grep -v '^\(<% @excludedatabases . join ( '|' ) %> \)$' <% end %> | while read dbname
84
+ <% if @excludedatabases . empty? -%>
85
+ mysql --defaults-extra-file=$TMPFILE -s -r -N -e 'SHOW DATABASES' | while read dbname
86
+ <% else -%>
87
+ mysql --defaults-extra-file=$TMPFILE -s -r -N -e 'SHOW DATABASES' | grep -v '^\(<% @excludedatabases . join ( '|' ) %> \)$' | while read dbname
88
+ <% end -%>
85
89
do
86
90
<%= @backupmethod -%> --defaults-extra-file=$TMPFILE --opt --flush-logs --single-transaction \
87
91
${ADDITIONAL_OPTIONS} \
You can’t perform that action at this time.
0 commit comments