From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0397913838B for ; Thu, 18 Sep 2014 20:41:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0F3FE0913; Thu, 18 Sep 2014 20:40:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77E20E0913 for ; Thu, 18 Sep 2014 20:40:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D58433F883 for ; Thu, 18 Sep 2014 20:40:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 134F25E9F for ; Thu, 18 Sep 2014 20:40:55 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1411072836.46bc533f719847da8a98d7a98a9fc5979d4dff23.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: scripts/ X-VCS-Repository: proj/sci X-VCS-Files: scripts/merge-dualHEAD X-VCS-Directories: scripts/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 46bc533f719847da8a98d7a98a9fc5979d4dff23 X-VCS-Branch: master Date: Thu, 18 Sep 2014 20:40:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4c21956a-ee3b-4d64-98ce-57af02e3b0af X-Archives-Hash: 513e3a74cfc5b9e746fff2e579cfd02b commit: 46bc533f719847da8a98d7a98a9fc5979d4dff23 Author: Justin Lecher gentoo org> AuthorDate: Thu Sep 18 20:40:36 2014 +0000 Commit: Justin Lecher gentoo 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 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