commit: 46bc533f719847da8a98d7a98a9fc5979d4dff23
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 18 20:40:36 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Sep 18 20:40:36 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=46bc533f
Update to latest portage versions
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
scripts/merge-dualHEAD | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/merge-dualHEAD b/scripts/merge-dualHEAD
index ca05ee4..961b461 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
