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
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
lyz
backupninja
Commits
e431f13b
Commit
e431f13b
authored
19 years ago
by
intrigeri
Browse files
Options
Downloads
Patches
Plain Diff
rdiff: fixed globbing bug for include, exclude and vsinclude (again.)
parent
22bea56d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-1
1 addition, 1 deletion
ChangeLog
handlers/rdiff
+4
-4
4 additions, 4 deletions
handlers/rdiff
with
5 additions
and
5 deletions
ChangeLog
+
1
−
1
View file @
e431f13b
...
...
@@ -23,7 +23,7 @@ version 0.9.3 -- unreleased
. code formatting cleanup (three spaces indent)
. fixed bug which caused only first include/exclude dir to
have "include = "
. fixed globbing bug with
exclude
. fixed globbing bug with
include and exclude (twice ;)
ninjahelper:
. now reports error if the helper script has a syntax error or bombs out.
. code formatting cleanup (three spaces indent)
...
...
This diff is collapsed.
Click to expand it.
handlers/rdiff
+
4
−
4
View file @
e431f13b
...
...
@@ -94,7 +94,7 @@ check_consistency "destination" "$type" "$user" "$host"
# See if vservers are configured
local
usevserver
=
no
if
[
$vservers_are_available
=
yes
]
;
then
if
[
$vservers_are_available
=
yes
-a
-n
"
$vsinclude
"
]
;
then
info
"vserver method enabled"
usevserver
=
yes
fi
...
...
@@ -160,12 +160,12 @@ execstr="$RDIFFBACKUP $options --print-statistics "
# TODO: order the includes and excludes
# excludes
for
i
in
$exclude
;
do
for
i
in
"
$exclude
"
;
do
str
=
"
${
i
//__star__/*
}
"
execstr
=
"
${
execstr
}
--exclude '
$str
' "
done
# includes
for
i
in
$include
;
do
for
i
in
"
$include
"
;
do
[
"
$i
"
!=
"/"
]
||
fatal
"Sorry, you cannot use 'include = /'"
str
=
"
${
i
//__star__/*
}
"
execstr
=
"
${
execstr
}
--include '
$str
' "
...
...
@@ -174,7 +174,7 @@ done
# vsinclude
if
[
$usevserver
=
yes
]
;
then
for
vserver
in
`
ls
$VROOTDIR
|grep
-v
lost+found
`
;
do
for
vi
in
$vsinclude
;
do
for
vi
in
"
$vsinclude
"
;
do
str
=
"
${
vi
//__star__/*
}
"
execstr
=
"
${
execstr
}
--include '
$VROOTDIR
/
$vserver$str
' "
done
...
...
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