diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2014-09-28 19:52:16 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2014-09-28 19:52:16 +0200 |
| commit | 990c5f4896b309fdcaf1dbbb5779177ecfcf6e74 (patch) | |
| tree | f54ebb8d5bcbfea1986b9c73eee0ec3c5b390577 /misc | |
| parent | install_qa_check_macho: introduce QA_IGNORE_INSTALL_NAME_FILES (diff) | |
| parent | Use a single grep call for gcc warning checks (diff) | |
| download | portage-990c5f4896b309fdcaf1dbbb5779177ecfcf6e74.tar.gz portage-990c5f4896b309fdcaf1dbbb5779177ecfcf6e74.tar.bz2 portage-990c5f4896b309fdcaf1dbbb5779177ecfcf6e74.zip | |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Conflicts:
bin/ebuild-helpers/emake
bin/misc-functions.sh
bin/portageq
doc/Makefile
pym/_emerge/EbuildBuild.py
pym/portage/const.py
pym/portage/dbapi/vartree.py
pym/portage/package/ebuild/doebuild.py
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/emerge-delta-webrsync | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync index b31015e93..3ecfc7ff0 100755 --- a/misc/emerge-delta-webrsync +++ b/misc/emerge-delta-webrsync @@ -338,12 +338,12 @@ sync_local() { if has metadata-transfer ${FEATURES} ; then __vecho "Updating cache ..." - "${PORTAGE_BIN_PATH}/emerge" --metadata + emerge --metadata fi local post_sync=${PORTAGE_CONFIGROOT}etc/portage/bin/post_sync [ -x "${post_sync}" ] && "${post_sync}" # --quiet suppresses output if there are no relevant news items - has news ${FEATURES} && "${PORTAGE_BIN_PATH}/emerge" --check-news --quiet + has news ${FEATURES} && emerge --check-news --quiet return 0 } |