| 1 |
commit: 779a9e686d89e31af43e33b1163b01aeff65d7ea |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 24 16:47:58 2014 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 24 16:47:58 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=779a9e68 |
| 7 |
|
| 8 |
emerge-webrsync: fix bug #523494 |
| 9 |
|
| 10 |
Use PATH instead of PORTAGE_BIN_PATH to locate emerge. |
| 11 |
|
| 12 |
Fixes: 0cc4c1ac21a2 ("Install Portage using setup.py") |
| 13 |
X-Gentoo-Bug: 523494 |
| 14 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=523494 |
| 15 |
|
| 16 |
--- |
| 17 |
bin/emerge-webrsync | 4 ++-- |
| 18 |
misc/emerge-delta-webrsync | 4 ++-- |
| 19 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync |
| 22 |
index 2f0689c..2443c2d 100755 |
| 23 |
--- a/bin/emerge-webrsync |
| 24 |
+++ b/bin/emerge-webrsync |
| 25 |
@@ -249,12 +249,12 @@ sync_local() { |
| 26 |
|
| 27 |
if has metadata-transfer ${FEATURES} ; then |
| 28 |
__vecho "Updating cache ..." |
| 29 |
- "${PORTAGE_BIN_PATH}/emerge" --metadata |
| 30 |
+ emerge --metadata |
| 31 |
fi |
| 32 |
local post_sync=${PORTAGE_CONFIGROOT}etc/portage/bin/post_sync |
| 33 |
[ -x "${post_sync}" ] && "${post_sync}" |
| 34 |
# --quiet suppresses output if there are no relevant news items |
| 35 |
- has news ${FEATURES} && "${PORTAGE_BIN_PATH}/emerge" --check-news --quiet |
| 36 |
+ has news ${FEATURES} && emerge --check-news --quiet |
| 37 |
return 0 |
| 38 |
} |
| 39 |
|
| 40 |
|
| 41 |
diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync |
| 42 |
index 96564af..a412ac8 100755 |
| 43 |
--- a/misc/emerge-delta-webrsync |
| 44 |
+++ b/misc/emerge-delta-webrsync |
| 45 |
@@ -338,12 +338,12 @@ sync_local() { |
| 46 |
|
| 47 |
if has metadata-transfer ${FEATURES} ; then |
| 48 |
__vecho "Updating cache ..." |
| 49 |
- "${PORTAGE_BIN_PATH}/emerge" --metadata |
| 50 |
+ emerge --metadata |
| 51 |
fi |
| 52 |
local post_sync=${PORTAGE_CONFIGROOT}etc/portage/bin/post_sync |
| 53 |
[ -x "${post_sync}" ] && "${post_sync}" |
| 54 |
# --quiet suppresses output if there are no relevant news items |
| 55 |
- has news ${FEATURES} && "${PORTAGE_BIN_PATH}/emerge" --check-news --quiet |
| 56 |
+ has news ${FEATURES} && emerge --check-news --quiet |
| 57 |
return 0 |
| 58 |
} |
Archives