From: intrigeri <intrigeri@boum.org>
Date: Sat, 3 May 2014 13:20:21 +0000 (+0000)
Subject: Merge remote-tracking branch 'sarava/bug/3929'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9e1d98a2532be9148b4e355b26a94792e13684b2;p=backupninja.git

Merge remote-tracking branch 'sarava/bug/3929'
---

9e1d98a2532be9148b4e355b26a94792e13684b2
diff --cc handlers/rsync.in
index b2c4b59,e624e6f..13399c9
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@@ -452,9 -444,11 +452,11 @@@ function rotate_long 
  
    max=$((keepdaily+1))
    if [ $keepweekly -gt 0 -a -d $backuproot/daily.$max -a ! -d $backuproot/weekly.1 ]; then
 -    echo "Debug: daily.$max --> weekly.1"
 +    debug "daily.$max --> weekly.1"
      $nice mv $backuproot/daily.$max $backuproot/weekly.1
      mkdir -p $backuproot/metadata/weekly.1
+     # Update increment folder date and setup metadata
+     $touch $backuproot/weekly.1
      date +%c%n%s > $backuproot/metadata/weekly.1/rotated
      #if [ -f $backuproot/metadata/daily.$max/created  ]; then
      #   $nice mv $backuproot/metadata/daily.$max/created $backuproot/metadata/weekly.1/
@@@ -463,9 -457,11 +465,11 @@@
  
    max=$((keepweekly+1))
    if [ $keepmonthly -gt 0 -a -d $backuproot/weekly.$max -a ! -d $backuproot/monthly.1 ]; then
 -    echo "Debug: weekly.$max --> monthly.1"
 +    debug "weekly.$max --> monthly.1"
      $nice mv $backuproot/weekly.$max $backuproot/monthly.1
      mkdir -p $backuproot/metadata/monthly.1
+     # Update increment folder date and setup metadata
+     $touch $backuproot/monthly.1
      date +%c%n%s > $backuproot/metadata/monthly.1/rotated
      #if [ -f $backuproot/metadata/weekly.$max/created  ]; then
      #   $nice mv $backuproot/metadata/weekly.$max/created $backuproot/metadata/weekly.1/