projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a823d16
)
update mtime after replacing config files
author
Marius Mauch
<genone@gentoo.org>
Wed, 19 Jul 2006 10:36:14 +0000
(10:36 -0000)
committer
Marius Mauch
<genone@gentoo.org>
Wed, 19 Jul 2006 10:36:14 +0000
(10:36 -0000)
svn path=/main/trunk/; revision=3932
bin/etc-update
patch
|
blob
|
history
diff --git
a/bin/etc-update
b/bin/etc-update
index 3cedc660b559c9c8ba6ef960895eb718328423e2..e28d38ef2e410898888cadf0f13078f93703d6c7 100755
(executable)
--- a/
bin/etc-update
+++ b/
bin/etc-update
@@
-295,6
+295,7
@@
Please select from the menu above (-1 to ignore this update): "
1) echo "Replacing ${ofile} with ${file}"
mv ${mv_opts} ${file} ${ofile}
[ -n "${OVERWRITE_ALL}" ] && my_input=-1
+ [ -e "${file}" ] || touch ${ofile}
continue
;;
2) echo "Deleting ${file}"
@@
-346,6
+347,7
@@
Please select from the menu above (-1 to exit, losing this merge): "
1) echo "Replacing ${ofile} with ${mfile}"
chmod --reference=${ofile} ${mfile}
mv ${mv_opts} ${mfile} ${ofile}
+ [ -e "${mfile}" ] || touch ${ofile}
rm ${rm_opts} ${file}
return 255
;;