diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2014-02-06 22:09:15 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2014-02-06 22:09:15 +0100 |
| commit | 8b858267c018f8fc8597405bc2484cbcf82b69a4 (patch) | |
| tree | 8fe9dfe8edbd78a4d250cb27b9b7a6e6aa0641f2 /misc | |
| parent | doebuild_environment: don't set EPREFIX (diff) | |
| parent | Solve some slot conflicts without backtracking (diff) | |
| download | portage-8b858267c018f8fc8597405bc2484cbcf82b69a4.tar.gz portage-8b858267c018f8fc8597405bc2484cbcf82b69a4.tar.bz2 portage-8b858267c018f8fc8597405bc2484cbcf82b69a4.zip | |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Conflicts:
bin/archive-conf
bin/binhost-snapshot
bin/check-implicit-pointer-usage.py
bin/chpathtool.py
bin/clean_locks
bin/dispatch-conf
bin/dohtml.py
bin/ebuild
bin/ebuild-helpers/prepstrip
bin/ebuild-ipc.py
bin/egencache
bin/emaint
bin/emerge
bin/emerge-webrsync
bin/emirrordist
bin/env-update
bin/filter-bash-environment.py
bin/fixpackages
bin/glsa-check
bin/install.py
bin/isolated-functions.sh
bin/lock-helper.py
bin/portageq
bin/quickpkg
bin/regenworld
bin/repoman
bin/save-ebuild-env.sh
bin/xattr-helper.py
bin/xpak-helper.py
misc/emerge-delta-webrsync
pym/portage/dispatch_conf.py
pym/portage/getbinpkg.py
pym/portage/tests/runTests
runtests.sh
tabcheck.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 66e9275b6..b31015e93 100755 --- a/misc/emerge-delta-webrsync +++ b/misc/emerge-delta-webrsync @@ -1,5 +1,5 @@ #!@PORTAGE_BASH@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Author: Brian Harring <ferringb@gentoo.org>, karltk@gentoo.org originally. # Rewritten from the old, Perl-based emerge-webrsync script @@ -47,7 +47,7 @@ export http_proxy ftp_proxy source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit repo_name=gentoo -repo_location=$(__repo_key "${repo_name}" location) +repo_location=$(__repo_attr "${repo_name}" location) if [[ -z ${repo_location} ]]; then eecho "Repository '${repo_name}' not found" exit 1 |