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 (parent:
dc8e99c
)
Fixed the include=/exclude= improper dereference problem in the dup handler
author
Micah Anderson
<micah@riseup.net>
Sat, 11 Mar 2006 07:22:44 +0000
(07:22 +0000)
committer
Micah Anderson
<micah@riseup.net>
Sat, 11 Mar 2006 07:22:44 +0000
(07:22 +0000)
ChangeLog
patch
|
blob
|
history
handlers/dup
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index a6fb5e51b26d63e46d3184786fb14550b87397fa..5f4eb4d0c2543024b512d82577b49b310a547d82 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-6,6
+6,8
@@
version 0.9.4 -- unreleased
. Fixed erroneous removal of tmpfile when it didn't exit
rdiff:
. Fixed improper include/exclude symlink dereference
. Fixed erroneous removal of tmpfile when it didn't exit
rdiff:
. Fixed improper include/exclude symlink dereference
+ dup:
+ . Fixed improper include/exclude symlink dereference
lib changes
vserver:
. init_vservers: fixed Debian bug #351083 (improper readlink syntax)
lib changes
vserver:
. init_vservers: fixed Debian bug #351083 (improper readlink syntax)
diff --git
a/handlers/dup
b/handlers/dup
index 6918702634d3d87a734aad1335e1d2ec2e16f3b3..227ba8bcf11f1edc90b0dd71d696ef6ea46ee52d 100644
(file)
--- a/
handlers/dup
+++ b/
handlers/dup
@@
-118,12
+118,14
@@
set -o noglob
# excludes
for i in $exclude; do
# excludes
for i in $exclude; do
+ i=`readlink -f $i`
str="${i//__star__/*}"
execstr="${execstr}--exclude '$str' "
done
# includes
for i in $include; do
str="${i//__star__/*}"
execstr="${execstr}--exclude '$str' "
done
# includes
for i in $include; do
+ i=`readlink -f $i`
str="${i//__star__/*}"
execstr="${execstr}--include '$str' "
done
str="${i//__star__/*}"
execstr="${execstr}--include '$str' "
done
@@
-132,7
+134,8
@@
done
if [ $usevserver = yes ]; then
for vserver in $vsnames; do
for vi in $vsinclude; do
if [ $usevserver = yes ]; then
for vserver in $vsnames; do
for vi in $vsinclude; do
- str="${vi//__star__/*}"
+ i=`readlink -f $VROOTDIR/$vserver$vi`
+ str="${i//__star__/*}"
execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
done
done
execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
done
done