From 46bc533f719847da8a98d7a98a9fc5979d4dff23 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 18 Sep 2014 22:40:36 +0200 Subject: Update to latest portage versions Signed-off-by: Justin Lecher --- scripts/merge-dualHEAD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.3-65-gdbad