From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29BCA138206 for ; Sun, 14 Jan 2018 16:19:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DBDEE0923; Sun, 14 Jan 2018 16:19:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F3AC9E0923 for ; Sun, 14 Jan 2018 16:19:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A139B335C39 for ; Sun, 14 Jan 2018 16:19:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B73A1A0 for ; Sun, 14 Jan 2018 16:19:06 +0000 (UTC) From: "Aaron Swenson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Swenson" Message-ID: <1515944825.f0f07f3166c116b5dcd56f15e482eefdfc84b9f5.titanofold@gentoo> Subject: [gentoo-commits] proj/postgresql/eselect:master commit in: / X-VCS-Repository: proj/postgresql/eselect X-VCS-Files: postgresql.eselect X-VCS-Directories: / X-VCS-Committer: titanofold X-VCS-Committer-Name: Aaron Swenson X-VCS-Revision: f0f07f3166c116b5dcd56f15e482eefdfc84b9f5 X-VCS-Branch: master Date: Sun, 14 Jan 2018 16:19:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5a96fd23-275d-494f-a905-c685a0824c72 X-Archives-Hash: 1c6e300eae58e032e3aa035dfee0bcb5 commit: f0f07f3166c116b5dcd56f15e482eefdfc84b9f5 Author: Aaron W. Swenson grandmasfridge org> AuthorDate: Sun Jan 14 15:47:05 2018 +0000 Commit: Aaron Swenson gentoo org> CommitDate: Sun Jan 14 15:47:05 2018 +0000 URL: https://gitweb.gentoo.org/proj/postgresql/eselect.git/commit/?id=f0f07f31 Force symlinks Any symlink we’re trying to make should only be handled by us. We may come across a symlink we missed in some previous clean up, but really should be set properly rather than failing because it exists. postgresql.eselect | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/postgresql.eselect b/postgresql.eselect index 51d7f50..aa89b49 100644 --- a/postgresql.eselect +++ b/postgresql.eselect @@ -97,7 +97,7 @@ linker() { # Create relative links so that they work both here and inside the new # root if $ROOT is not "/". rel_source=$(relative_name "${link_source}" "${target_dir}") - ln -s "${rel_source}" "${link_target}" || die -q "Unable to create link!" + ln -sf "${rel_source}" "${link_target}" || die -q "Unable to create link!" done } @@ -225,7 +225,7 @@ do_set() { # root if $ROOT is not "/" rel_source=$(relative_name "${include_sources[$i]}" "$(dirname "${INCLUDE_TARGETS[$i]}")") - ln -s "$rel_source" "${INCLUDE_TARGETS[$i]}" || \ + ln -sf "$rel_source" "${INCLUDE_TARGETS[$i]}" || \ die -q "Unable to create link! $rel_source -> ${INCLUDE_TARGETS[$i]}" done @@ -235,7 +235,7 @@ do_set() { if [[ -d "${USR_PATH}/${x}/postgresql-${slot}/${x}" ]] ; then # 'linker' function doesn't work for linking directories. # Default lib path - create a relative link - ln -s "postgresql-${slot}/${x}" "${USR_PATH}/${x}/postgresql" + ln -sf "postgresql-${slot}/${x}" "${USR_PATH}/${x}/postgresql" # Linker works for files linker "${USR_PATH}/${x}/postgresql-${slot}/${x}/" \ @@ -264,7 +264,7 @@ do_set() { # Default share path - use a relative link here by just specifying the # base name - ln -s "postgresql-${slot}" "${USR_PATH}/share/postgresql" + ln -sf "postgresql-${slot}" "${USR_PATH}/share/postgresql" echo "success!" }