Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 708648 Details for
Bug 790305
app-eselect/eselect-rust: use relative symlinks
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix.patch
0001-Stop-using-absolute-symlinks.patch (text/plain), 1.97 KB, created by
David Michael
on 2021-05-15 02:19:43 UTC
(
hide
)
Description:
fix.patch
Filename:
MIME Type:
Creator:
David Michael
Created:
2021-05-15 02:19:43 UTC
Size:
1.97 KB
patch
obsolete
>From 9d6a813391a600a4b88decfb5e04f180bbc0970c Mon Sep 17 00:00:00 2001 >From: David Michael <fedora.dm0@gmail.com> >Date: Fri, 14 May 2021 10:16:57 -0400 >Subject: [PATCH] Stop using absolute symlinks > >Prefixing everything with ${EROOT} produces invalid paths on the >target system. All of the symlinks point to files in the same >directory, so there is no reason to specify directories at all. > >Signed-off-by: David Michael <fedora.dm0@gmail.com> >--- > README.md | 4 ---- > rust.eselect.in | 8 ++++---- > 2 files changed, 4 insertions(+), 8 deletions(-) > >diff --git a/README.md b/README.md >index 6ae99cf..ac3a34d 100644 >--- a/README.md >+++ b/README.md >@@ -75,7 +75,3 @@ then `/etc/env.d/rust/provider-TARGET` should contain: > ``` > > Note, that `/usr/bin/rustc` should not be listed, as it is always managed by eselect. >- >-### Notes >- >-**eselect-rust** automatically prepends every path with `${EROOT}` variable. >diff --git a/rust.eselect.in b/rust.eselect.in >index c3ee046..7ab845b 100644 >--- a/rust.eselect.in >+++ b/rust.eselect.in >@@ -1,4 +1,4 @@ >-# Copyright 1999-2020 Gentoo Authors >+# Copyright 1999-2021 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > > DESCRIPTION="Manage the Rust compiler versions" >@@ -157,7 +157,7 @@ set_symlink() { > > remove_symlink "${dest}" > >- if [[ -e ${source} ]]; then >+ if [[ -e ${dest%/*}/${source} ]]; then > mkdir -p "$(dirname ${dest})" || die -q "directory creation failed for $(dirname ${dest})" > ln -s "${source}" "${dest}" || die -q "${dest} symlink setting failed" > else >@@ -197,11 +197,11 @@ set_version() { > > unset_version > >- set_symlink "${BIN_DIR}/rustc-${target_postfix}" "${BIN_DIR}/rustc" >+ set_symlink "rustc-${target_postfix}" "${BIN_DIR}/rustc" > > local symlinks=( $(get_symlinks ${target}) ) > for i in "${symlinks[@]}"; do >- set_symlink "${EROOT%/}${i}-${target_postfix}" "${EROOT%/}${i}" >+ set_symlink "${i##*/}-${target_postfix}" "${EROOT%/}${i}" > done > > cp "${ENV_D_PATH}/rust/provider-${target}" \ >-- >2.31.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 790305
: 708648