commit: 37430278d193116760fede99bea13c41c57b36b2 Author: kewl fft <kewl <AT> alto <DOT> eu <DOT> org> AuthorDate: Tue Apr 24 19:31:27 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Apr 24 20:18:51 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=37430278
etc-update: fix double / in merged file names $2 already starts with /, no need to add one between $TMP and $2 Closes: https://github.com/gentoo/portage/pull/314 bin/etc-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/etc-update b/bin/etc-update index 5a4041c07..fdf205a68 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -557,7 +557,7 @@ do_merge() { local file="${1}" local ofile="${2}" - local mfile="${TMP}/${2}.merged" + local mfile="${TMP}/${2#/}.merged" local -i my_input=0 if [[ -L ${file} && -L ${ofile} ]] ; then
