Merge pull request #186 from bastelfreak/set

Run backup create with set +e if pruning is enabled

Author: bastelfreak

spec/classes/init_spec.rb

@@ -24,7 +24,7 @@
 
         it { is_expected.to contain_file('/etc/borg') }
         it { is_expected.to contain_file('/etc/profile.d/borg.sh') }
-        it { is_expected.to contain_file('/usr/local/bin/borg-backup') }
+        it { is_expected.to contain_file('/usr/local/bin/borg-backup').with_content(%r{borg create.*" \|\| true}) }
         it { is_expected.to contain_file('/usr/local/bin/borg_exporter') }
         it { is_expected.to contain_file('/etc/borg-restore.cfg') }
         it { is_expected.to contain_class('borg::install') }
@@ -190,7 +190,7 @@
           }
         end
 
-        it { is_expected.not_to contain_file('/usr/local/bin/borg-backup').with_content(%r{/^\s+borg prune/}) }
+        it { is_expected.to contain_file('/usr/local/bin/borg-backup').without_content(%r{/^\s+borg prune/}).without_content(%r{borg create.*" \|\| true}) }
       end
 
       context 'with absolute backup destination dir present' do

templates/borg-backup.sh.epp

@@ -180,7 +180,7 @@ backup_borg() {
   # Change the working directory in case the source paths are relative
   cd "<%= $working_directory %>"
 
-  borg create "${options[@]}" --stats --verbose "$dst::backup-$(date "+%Y%m%d-%H%M%S")" "${src[@]}"
+  borg create "${options[@]}" --stats --verbose "$dst::backup-$(date "+%Y%m%d-%H%M%S")" "${src[@]}"<% if $manage_prune { %> || true<% } %>
 <% if $manage_prune { -%>
   # keep all backups from the last <%= $keep_within %> days
   # keep at least one backup for each day for <%= $keep_daily %> days