aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-09-18 22:40:36 +0200
committerJustin Lecher <jlec@gentoo.org>2014-09-18 22:40:36 +0200
commit46bc533f719847da8a98d7a98a9fc5979d4dff23 (patch)
tree13448da976c73a792ac94231091badc5496d5e2e /scripts
parentMerge remote-tracking branch 'github/master' (diff)
downloadsci-46bc533f719847da8a98d7a98a9fc5979d4dff23.tar.gz
sci-46bc533f719847da8a98d7a98a9fc5979d4dff23.tar.bz2
sci-46bc533f719847da8a98d7a98a9fc5979d4dff23.zip
Update to latest portage versions
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/merge-dualHEAD8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/merge-dualHEAD b/scripts/merge-dualHEAD
index ca05ee4f5..961b46153 100755
--- a/scripts/merge-dualHEAD
+++ b/scripts/merge-dualHEAD
@@ -1,10 +1,10 @@
#!/bin/bash
# This script is licensed under BSD-3
-if [[ -f /usr/lib64/portage/bin/isolated-functions.sh ]]; then
- . /usr/lib64/portage/bin/isolated-functions.sh
-elif [[ -f /usr/lib/portage/bin/isolated-functions.sh ]]; then
- . /usr/lib/portage/bin/isolated-functions.sh
+export PORTAGE_BIN_PATH="/usr/lib64/portage/python2.7"
+
+if [[ -f "${PORTAGE_BIN_PATH}"/isolated-functions.sh ]]; then
+ . "${PORTAGE_BIN_PATH}"/isolated-functions.sh
else
alias ebegin=echo
alias eend=true