projects
/
matthijs
/
upstream
/
backupninja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5e1f333
)
minor
author
Elijah Saxon
<elijah@riseup.net>
Sat, 26 Feb 2005 21:28:13 +0000
(21:28 +0000)
committer
Elijah Saxon
<elijah@riseup.net>
Sat, 26 Feb 2005 21:28:13 +0000
(21:28 +0000)
handlers/maildir
patch
|
blob
|
history
diff --git
a/handlers/maildir
b/handlers/maildir
index 8de2b979b7a959f2b3d36e948f00920e29770dcb..6da5c0f08f5a7c6baf76283156d302a21e8da864 100644
(file)
--- a/
handlers/maildir
+++ b/
handlers/maildir
@@
-147,23
+147,23
@@
function do_rotate() {
[ "\$oldest" == "" ] && oldest=0
for (( i=\$oldest; i > 0; i-- )); do
if [ -d \$dir.\$i ]; then
[ "\$oldest" == "" ] && oldest=0
for (( i=\$oldest; i > 0; i-- )); do
if [ -d \$dir.\$i ]; then
- if [ -f \$dir.\$i/
rot
ated ]; then
-
rotated=\`tail -1 \$dir.\$i/rot
ated\`
+ if [ -f \$dir.\$i/
cre
ated ]; then
+
created=\`tail -1 \$dir.\$i/cre
ated\`
else
else
-
rot
ated=0
+
cre
ated=0
fi
fi
- cutoff_time=\$(( now - (seconds*
i
) ))
- if [
\$rotated -l
t \$cutoff_time ]; then
+ cutoff_time=\$(( now - (seconds*
(i-1)
) ))
+ if [
! \$created -g
t \$cutoff_time ]; then
next=\$(( i + 1 ))
if [ ! -d \$dir.\$next ]; then
next=\$(( i + 1 ))
if [ ! -d \$dir.\$next ]; then
- echo "mv \$dir.\$i \$dir.\$next"
+ echo "
Debug:
mv \$dir.\$i \$dir.\$next"
mv \$dir.\$i \$dir.\$next
date +%c%n%s > \$dir.\$next/rotated
else
echo "Info: skipping rotation of \$dir.\$i because \$dir.\$next already exists."
fi
else
mv \$dir.\$i \$dir.\$next
date +%c%n%s > \$dir.\$next/rotated
else
echo "Info: skipping rotation of \$dir.\$i because \$dir.\$next already exists."
fi
else
- echo "Info: skipping rotation of \$dir.\$i because it was
rotated" \$(( (now-rot
ated)/86400)) "days ago ("\$(( (now-cutoff_time)/86400))" needed)."
+ echo "Info: skipping rotation of \$dir.\$i because it was
created" \$(( (now-cre
ated)/86400)) "days ago ("\$(( (now-cutoff_time)/86400))" needed)."
fi
fi
done
fi
fi
done
@@
-194,10
+194,9
@@
function do_rotate() {
if [ -d $backuproot/rotate.tmp ]; then
echo "Info: removing $backuproot/rotate.tmp"
rm -rf $backuproot/rotate.tmp
if [ -d $backuproot/rotate.tmp ]; then
echo "Info: removing $backuproot/rotate.tmp"
rm -rf $backuproot/rotate.tmp
- else
- echo "Info: moving \$dir.\$i to $backuproot/rotate.tmp"
- mv \$dir.\$i $backuproot/rotate.tmp
fi
fi
+ echo "Info: moving \$dir.\$i to $backuproot/rotate.tmp"
+ mv \$dir.\$i $backuproot/rotate.tmp
fi
done
done
fi
done
done
@@
-236,6
+235,9
@@
function setup_remote_dirs() {
echo "Fatal: could not create directory $dir.1 on host $desthost"
exit 1
fi
echo "Fatal: could not create directory $dir.1 on host $desthost"
exit 1
fi
+ for i in a b c d e f g h i j k l m n o p q r s t u v w y x z; do
+ mkdir $dir.1/\$i
+ done
fi
if [ -d $destdir/$backuptype.2 ]; then
echo "Info: updating hard links to $dir.1. This may take a while."
fi
if [ -d $destdir/$backuptype.2 ]; then
echo "Info: updating hard links to $dir.1. This may take a while."