commit:     0b249d7175ae71e188e02ea60a90e9a932e2fda3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  6 13:53:17 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 21:50:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b249d71

bzr.eclass: Add --overwrite-tags option to pull command.

Closes: https://bugs.gentoo.org/446422

 eclass/bzr.eclass | 6 +++---
 1 file 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:

Reply via email to