projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c31e80
)
For bug #8423, make etc-update preserve timestamps when possible.
author
Zac Medico
<zmedico@gentoo.org>
Sun, 26 Nov 2006 14:06:38 +0000
(14:06 -0000)
committer
Zac Medico
<zmedico@gentoo.org>
Sun, 26 Nov 2006 14:06:38 +0000
(14:06 -0000)
svn path=/main/trunk/; revision=5135
bin/etc-update
patch
|
blob
|
history
diff --git
a/bin/etc-update
b/bin/etc-update
index 3c9d87eff9c232085ae1c59648067c07f7ed4bdb..17a008bf677cd00a07b4b0db3c6ee4fdcd24d7ff 100755
(executable)
--- a/
bin/etc-update
+++ b/
bin/etc-update
@@
-336,7
+336,6
@@
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}"
@@
-388,7
+387,6
@@
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
;;