summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2021-09-25 13:59:33 +0200
committerUlrich Müller <ulm@gentoo.org>2021-09-27 18:54:45 +0200
commite20e90146f5d6191788a211cf0404a4f0af5c60b (patch)
tree3a9e64df5b1b9a471c27334fd273c8531020598d /eclass
parentbzr.eclass: Names of internal functions, eclassdoc, messages (diff)
downloadgentoo-e20e90146f5d6191788a211cf0404a4f0af5c60b.tar.gz
gentoo-e20e90146f5d6191788a211cf0404a4f0af5c60b.tar.bz2
gentoo-e20e90146f5d6191788a211cf0404a4f0af5c60b.zip
bzr.eclass: Fix EBZR_OFFLINE logic
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/bzr.eclass7
1 files changed, 3 insertions, 4 deletions
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index d5ac999aeb8c..de73aed7f676 100644
--- a/eclass/bzr.eclass
+++ b/eclass/bzr.eclass
@@ -158,8 +158,8 @@ EXPORT_FUNCTIONS src_unpack
_bzr_initial_fetch() {
local repo_uri=$1 branch_dir=$2
- if [[ -n "${EBZR_OFFLINE}" ]]; then
- ewarn "EBZR_OFFLINE cannot be used when there is no local branch yet."
+ if [[ -n ${EBZR_OFFLINE} ]]; then
+ die "EBZR_OFFLINE cannot be used when there is no local branch yet."
fi
# fetch branch
@@ -179,7 +179,7 @@ _bzr_initial_fetch() {
_bzr_update() {
local repo_uri=$1 branch_dir=$2
- if [[ -n "${EBZR_OFFLINE}" ]]; then
+ if [[ -n ${EBZR_OFFLINE} ]]; then
einfo "skipping bzr pull -->"
einfo " repository: ${repo_uri}"
else
@@ -241,7 +241,6 @@ bzr_fetch() {
_bzr_initial_fetch "${EBZR_INITIAL_URI}" "${branch_dir}"
if [[ ${EBZR_REPO_URI} != "${EBZR_INITIAL_URI}" ]]; then
EBZR_UPDATE_CMD="${EBZR_UPDATE_CMD} --remember --overwrite" \
- EBZR_OFFLINE="" \
bzr_update "${EBZR_REPO_URI}" "${branch_dir}"
fi
fi