Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
backupninja
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Liberate
backupninja
Commits
4e0519e3
Commit
4e0519e3
authored
15 years ago
by
intrigeri
Browse files
Options
Downloads
Patches
Plain Diff
rdiff,dup: fix include/exclude paths with spaces (Closes: #398435)
This also fixes Redmine bug #1021.
parent
47313bca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChangeLog
+3
-0
3 additions, 0 deletions
ChangeLog
handlers/dup.in
+9
-0
9 additions, 0 deletions
handlers/dup.in
handlers/rdiff.in
+9
-0
9 additions, 0 deletions
handlers/rdiff.in
with
21 additions
and
0 deletions
ChangeLog
+
3
−
0
View file @
4e0519e3
...
...
@@ -42,6 +42,8 @@ version 0.9.7 -- UNRELEASED
database names.
. Use bash pipefail option when needed so that failed dumps are
reported as such.
rdiff:
. Fix include/exclude paths with spaces (Closes: #398435)
sys:
. New luksheaders option (default=disabled) to backup the Luks header
of every Luks device.
...
...
@@ -55,6 +57,7 @@ version 0.9.7 -- UNRELEASED
one time (Closes: #536360)
. Report duplicity output as "info" so that it can be included in
report e-mail when reportinfo is on (Closes: #563734)
. Fix include/exclude paths with spaces
helper changes
dup:
. Do not propose to exclude /home/*/.gnupg twice anymore
...
...
This diff is collapsed.
Click to expand it.
handlers/dup.in
+
9
−
0
View file @
4e0519e3
...
...
@@ -189,26 +189,35 @@ fi
set
-o
noglob
# excludes
SAVEIFS
=
$IFS
IFS
=
$(
echo
-en
"
\n\b
"
)
for
i
in
$exclude
;
do
str
=
"
${
i
//__star__/*
}
"
execstr_source
=
"
${
execstr_source
}
--exclude '
$str
'"
done
IFS
=
$SAVEIFS
# includes
SAVEIFS
=
$IFS
IFS
=
$(
echo
-en
"
\n\b
"
)
for
i
in
$include
;
do
[
"
$i
"
!=
"/"
]
||
fatal
"Sorry, you cannot use 'include = /'"
str
=
"
${
i
//__star__/*
}
"
execstr_source
=
"
${
execstr_source
}
--include '
$str
'"
done
IFS
=
$SAVEIFS
# vsincludes
if
[
$usevserver
=
yes
]
;
then
for
vserver
in
$vsnames
;
do
SAVEIFS
=
$IFS
IFS
=
$(
echo
-en
"
\n\b
"
)
for
vi
in
$vsinclude
;
do
str
=
"
${
vi
//__star__/*
}
"
str
=
"
$VROOTDIR
/
$vserver$str
"
execstr_source
=
"
${
execstr_source
}
--include '
$str
'"
done
IFS
=
$SAVEIFS
done
fi
...
...
This diff is collapsed.
Click to expand it.
handlers/rdiff.in
+
9
−
0
View file @
4e0519e3
...
...
@@ -209,20 +209,28 @@ symlinks_warning="Maybe you have mixed symlinks and '*' in this statement, which
# TODO: order the includes and excludes
# excludes
SAVEIFS
=
$IFS
IFS
=
$(
echo
-en
"
\n\b
"
)
for
i
in
$exclude
;
do
str
=
"
${
i
//__star__/*
}
"
execstr
=
"
${
execstr
}
--exclude '
$str
' "
done
IFS
=
$SAVEIFS
# includes
SAVEIFS
=
$IFS
IFS
=
$(
echo
-en
"
\n\b
"
)
for
i
in
$include
;
do
[
"
$i
"
!=
"/"
]
||
fatal
"Sorry, you cannot use 'include = /'"
str
=
"
${
i
//__star__/*
}
"
execstr
=
"
${
execstr
}
--include '
$str
' "
done
IFS
=
$SAVEIFS
# vsinclude
if
[
$usevserver
=
yes
]
;
then
for
vserver
in
$vsnames
;
do
SAVEIFS
=
$IFS
IFS
=
$(
echo
-en
"
\n\b
"
)
for
vi
in
$vsinclude
;
do
str
=
"
${
vi
//__star__/*
}
"
str
=
"
$VROOTDIR
/
$vserver$str
"
...
...
@@ -232,6 +240,7 @@ if [ $usevserver = yes ]; then
warning
"vsinclude statement '
${
vi
//__star__/*
}
' will be ignored for VServer
$vserver
.
$symlinks_warning
"
fi
done
IFS
=
$SAVEIFS
done
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment