summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2018-02-06 14:53:17 +0100
committerUlrich Müller <ulm@gentoo.org>2018-02-10 22:50:59 +0100
commit0b249d7175ae71e188e02ea60a90e9a932e2fda3 (patch)
tree4f021ba90d51bb962b57e806df06ceb2a0eebd3d /eclass/bzr.eclass
parentnet-voip/yate: Bump, remove qt4, cleanup. (diff)
downloadgentoo-0b249d7175ae71e188e02ea60a90e9a932e2fda3.tar.gz
gentoo-0b249d7175ae71e188e02ea60a90e9a932e2fda3.tar.bz2
gentoo-0b249d7175ae71e188e02ea60a90e9a932e2fda3.zip
bzr.eclass: Add --overwrite-tags option to pull command.
Closes: https://bugs.gentoo.org/446422
Diffstat (limited to 'eclass/bzr.eclass')
-rw-r--r--eclass/bzr.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index ef1b4793686..9b3e0b6cf4d 100644
--- a/eclass/bzr.eclass
+++ b/eclass/bzr.eclass
@@ -27,11 +27,11 @@ case "${EAPI:-0}" in
*) EXPORT_FUNCTIONS src_unpack src_prepare ;;
esac
-DEPEND=">=dev-vcs/bzr-2.0.1"
+DEPEND=">=dev-vcs/bzr-2.6.0"
case "${EAPI:-0}" in
0|1) ;;
*) [[ ${EBZR_REPO_URI%%:*} = sftp ]] \
- && DEPEND=">=dev-vcs/bzr-2.0.1[sftp]" ;;
+ && DEPEND=">=dev-vcs/bzr-2.6.0[sftp]" ;;
esac
# @ECLASS-VARIABLE: EBZR_STORE_DIR
@@ -57,7 +57,7 @@ esac
# @ECLASS-VARIABLE: EBZR_UPDATE_CMD
# @DESCRIPTION:
# The Bazaar command to update the sources.
-: ${EBZR_UPDATE_CMD:="bzr pull"}
+: ${EBZR_UPDATE_CMD:="bzr pull --overwrite-tags"}
# @ECLASS-VARIABLE: EBZR_EXPORT_CMD
# @DESCRIPTION: