diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-10-18 00:54:14 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-10-18 00:54:14 +0200 |
| commit | 3f6ebaf5f56f2c31e3639ec16c8e21db0a734cc8 (patch) | |
| tree | db8667afeb31aee723e3d6c0b79dd17e224539e6 /bin | |
| parent | e72d8353f7a9493e0508c367e416423b52ea22ce (diff) | |
| download | portage-3f6ebaf5f56f2c31e3639ec16c8e21db0a734cc8.tar.gz portage-3f6ebaf5f56f2c31e3639ec16c8e21db0a734cc8.tar.bz2 portage-3f6ebaf5f56f2c31e3639ec16c8e21db0a734cc8.zip | |
Make __source_all_bashrcs() and install_symlink_html_docs() compatible with subslots.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 2 | ||||
| -rwxr-xr-x | bin/misc-functions.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b04244128..d83789c49 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -398,7 +398,7 @@ __source_all_bashrcs() { if [[ $EBUILD_PHASE != depend ]] ; then # The user's bashrc is the ONLY non-portage bit of code that can # change shopts without a QA violation. - for x in "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN},${PN}:${SLOT},${P},${PF}}; do + for x in "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN},${PN}:${SLOT%/*},${P},${PF}}; do if [ -r "${x}" ]; then # If $- contains x, then tracing has already been enabled # elsewhere for some reason. We preserve it's state so as diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 4a1c46dc3..f3b0cc0a3 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -34,7 +34,7 @@ install_symlink_html_docs() { if [ -z "${SLOT}" -o "${SLOT}" = "0" ] ; then mysympath="${DOC_SYMLINKS_DIR}/${CATEGORY}/${PN}" else - mysympath="${DOC_SYMLINKS_DIR}/${CATEGORY}/${PN}-${SLOT}" + mysympath="${DOC_SYMLINKS_DIR}/${CATEGORY}/${PN}-${SLOT%/*}" fi einfo "Symlinking ${mysympath} to the HTML documentation" dodir "${DOC_SYMLINKS_DIR}/${CATEGORY}" |