| 1 |
commit: 579e25454b12e266fffc10f48e62be4155522e0b |
| 2 |
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 1 15:32:16 2015 +0000 |
| 4 |
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Jan 1 15:32:16 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=579e2545 |
| 7 |
|
| 8 |
Use /usr/lib instead of /usr/lib64 |
| 9 |
|
| 10 |
Not all people commit from 64-bit hosts, so lib64 brokes script for |
| 11 |
them. /usr/lib should be safe, as it should symlink to current main |
| 12 |
API on the system. |
| 13 |
|
| 14 |
--- |
| 15 |
scripts/merge-dualHEAD | 2 +- |
| 16 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/scripts/merge-dualHEAD b/scripts/merge-dualHEAD |
| 19 |
index 961b461..43b7610 100755 |
| 20 |
--- a/scripts/merge-dualHEAD |
| 21 |
+++ b/scripts/merge-dualHEAD |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
#!/bin/bash |
| 24 |
# This script is licensed under BSD-3 |
| 25 |
|
| 26 |
-export PORTAGE_BIN_PATH="/usr/lib64/portage/python2.7" |
| 27 |
+export PORTAGE_BIN_PATH="/usr/lib/portage/python2.7" |
| 28 |
|
| 29 |
if [[ -f "${PORTAGE_BIN_PATH}"/isolated-functions.sh ]]; then |
| 30 |
. "${PORTAGE_BIN_PATH}"/isolated-functions.sh |
Archives