projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add x86-ubc-02.d.o
[mirror/dsa-puppet.git]
/
modules
/
roles
/
files
/
static-mirroring
/
static-master-update-component
diff --git
a/modules/roles/files/static-mirroring/static-master-update-component
b/modules/roles/files/static-mirroring/static-master-update-component
index
c115ae4
..
4ab5143
100755
(executable)
--- a/
modules/roles/files/static-mirroring/static-master-update-component
+++ b/
modules/roles/files/static-mirroring/static-master-update-component
@@
-132,11
+132,11
@@
rsync --delete \
"$src/." "$tmpdir_new/."
echo "$0: Done. Committing."
"$src/." "$tmpdir_new/."
echo "$0: Done. Committing."
-mv "$tgt" "$tmpdir_old/old"
-if ! mv "$tmpdir_new" "$tgt"; then
+mv
--no-target-directory
"$tgt" "$tmpdir_old/old"
+if ! mv
--no-target-directory
"$tmpdir_new" "$tgt"; then
echo >&2 "$0: WARNING: could not move $tmpdir_new to $tgt. Trying to recover"
rm -rf "$tgt"
echo >&2 "$0: WARNING: could not move $tmpdir_new to $tgt. Trying to recover"
rm -rf "$tgt"
- mv "$tmpdir_old/old" "$tgt"
+ mv
--no-target-directory
"$tmpdir_old/old" "$tgt"
echo >&2 "$0: Rolled back to old tree, maybe even successfully."
exit 1
fi
echo >&2 "$0: Rolled back to old tree, maybe even successfully."
exit 1
fi