| 1 |
commit: e20e90146f5d6191788a211cf0404a4f0af5c60b |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 25 11:59:33 2021 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 27 16:54:45 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20e9014 |
| 7 |
|
| 8 |
bzr.eclass: Fix EBZR_OFFLINE logic |
| 9 |
|
| 10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/bzr.eclass | 7 +++---- |
| 13 |
1 file changed, 3 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass |
| 16 |
index d5ac999aeb8..de73aed7f67 100644 |
| 17 |
--- a/eclass/bzr.eclass |
| 18 |
+++ b/eclass/bzr.eclass |
| 19 |
@@ -158,8 +158,8 @@ EXPORT_FUNCTIONS src_unpack |
| 20 |
_bzr_initial_fetch() { |
| 21 |
local repo_uri=$1 branch_dir=$2 |
| 22 |
|
| 23 |
- if [[ -n "${EBZR_OFFLINE}" ]]; then |
| 24 |
- ewarn "EBZR_OFFLINE cannot be used when there is no local branch yet." |
| 25 |
+ if [[ -n ${EBZR_OFFLINE} ]]; then |
| 26 |
+ die "EBZR_OFFLINE cannot be used when there is no local branch yet." |
| 27 |
fi |
| 28 |
|
| 29 |
# fetch branch |
| 30 |
@@ -179,7 +179,7 @@ _bzr_initial_fetch() { |
| 31 |
_bzr_update() { |
| 32 |
local repo_uri=$1 branch_dir=$2 |
| 33 |
|
| 34 |
- if [[ -n "${EBZR_OFFLINE}" ]]; then |
| 35 |
+ if [[ -n ${EBZR_OFFLINE} ]]; then |
| 36 |
einfo "skipping bzr pull -->" |
| 37 |
einfo " repository: ${repo_uri}" |
| 38 |
else |
| 39 |
@@ -241,7 +241,6 @@ bzr_fetch() { |
| 40 |
_bzr_initial_fetch "${EBZR_INITIAL_URI}" "${branch_dir}" |
| 41 |
if [[ ${EBZR_REPO_URI} != "${EBZR_INITIAL_URI}" ]]; then |
| 42 |
EBZR_UPDATE_CMD="${EBZR_UPDATE_CMD} --remember --overwrite" \ |
| 43 |
- EBZR_OFFLINE="" \ |
| 44 |
bzr_update "${EBZR_REPO_URI}" "${branch_dir}" |
| 45 |
fi |
| 46 |
fi |
Archives