aboutsummaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-11-07 15:10:50 -0200
committerSilvio Rhatto <rhatto@riseup.net>2014-11-07 15:10:50 -0200
commit22d0f885bc9bed393bc27589afcc46f2cc647b5c (patch)
treeded87f39ad0bb2e5f2ea8cca0bffa94134d8f791 /files
parentb89122f4559b84aa70302ba8602dc3114479e343 (diff)
downloadpuppet-backup-22d0f885bc9bed393bc27589afcc46f2cc647b5c.tar.gz
puppet-backup-22d0f885bc9bed393bc27589afcc46f2cc647b5c.tar.bz2
Rsync handler patch from upstream #8196 (3)
Diffstat (limited to 'files')
-rw-r--r--files/handlers/rsync44
1 files changed, 23 insertions, 21 deletions
diff --git a/files/handlers/rsync b/files/handlers/rsync
index 2b55c61..f57cb5c 100644
--- a/files/handlers/rsync
+++ b/files/handlers/rsync
@@ -735,25 +735,24 @@ function move_files {
function prepare_storage {
- if [ "$test" ]; then
- return
- fi
-
section="`basename $SECTION`"
if [ "$format" == "short" ]; then
suffix="$section.0"
- info "Rotating $backupdir/$SECTION..."
- echo "Rotating $backupdir/$SECTION..." >> $log
- if [ "$dest" == "remote" ]; then
- rotate_short_remote $backupdir/$SECTION/$section $keep
- else
- rotate_short $backupdir/$SECTION/$section $keep
- if [ ! -d "$backupdir/$SECTION/$section.0" ]; then
- mkdir -p $backupdir/$SECTION/$section.0
- fi
+ if [ ! "$test" ]; then
+ info "Rotating $backupdir/$SECTION..."
+ echo "Rotating $backupdir/$SECTION..." >> $log
+
+ if [ "$dest" == "remote" ]; then
+ rotate_short_remote $backupdir/$SECTION/$section $keep
+ else
+ rotate_short $backupdir/$SECTION/$section $keep
+ if [ ! -d "$backupdir/$SECTION/$section.0" ]; then
+ mkdir -p $backupdir/$SECTION/$section.0
+ fi
+ fi
fi
elif [ "$format" == "long" ]; then
@@ -769,15 +768,18 @@ function prepare_storage {
fi
suffix="$btype.1"
- info "Rotating $backupdir/$SECTION/..."
- echo "Rotating $backupdir/$SECTION/..." >> $log
- if [ "$dest" == "remote" ]; then
- rotate_long_remote $backupdir/$SECTION
- setup_long_dirs_remote $backupdir/$SECTION $btype
- else
- rotate_long $backupdir/$SECTION
- setup_long_dirs $backupdir/$SECTION $btype
+ if [ ! "$test" ]; then
+ info "Rotating $backupdir/$SECTION/..."
+ echo "Rotating $backupdir/$SECTION/..." >> $log
+
+ if [ "$dest" == "remote" ]; then
+ rotate_long_remote $backupdir/$SECTION
+ setup_long_dirs_remote $backupdir/$SECTION $btype
+ else
+ rotate_long $backupdir/$SECTION
+ setup_long_dirs $backupdir/$SECTION $btype
+ fi
fi
elif [ "$format" == "mirror" ]; then