From 0b249d7175ae71e188e02ea60a90e9a932e2fda3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Tue, 6 Feb 2018 14:53:17 +0100
Subject: 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(-)

(limited to 'eclass/bzr.eclass')

diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index ef1b47936867..9b3e0b6cf4dc 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:
-- 
cgit v1.2.3