summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2009-02-22 13:01:17 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2009-02-22 13:01:17 +0000
commit025390e7a42aef5d436df482839f051c2da3603c (patch)
tree20894102902c5f42d2f2b3b48ce1b9a22f704130
parentVersion bump (diff)
downloadgentoo-2-025390e7a42aef5d436df482839f051c2da3603c.tar.gz
gentoo-2-025390e7a42aef5d436df482839f051c2da3603c.tar.bz2
gentoo-2-025390e7a42aef5d436df482839f051c2da3603c.zip
Use clone --pull to fix bug #238314.
-rw-r--r--eclass/mercurial.eclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index 93c6bde8d1fa..3652f68e2b91 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.3 2006/10/13 23:45:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.4 2009/02/22 13:01:17 nelchael Exp $
# mercurial: Fetch sources from mercurial repositories, similar to cvs.eclass.
# To use this from an ebuild, set EHG_REPO_URI in your ebuild. Then either
@@ -14,12 +14,12 @@ DEPEND="dev-util/mercurial net-misc/rsync"
EHG_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/hg-src"
# This must be set by the ebuild
-: ${EHG_REPO_URI:=} # repository uri
+: ${EHG_REPO_URI:=} # repository uri
# These can be set by the ebuild but are usually fine as-is
-: ${EHG_PROJECT:=$PN} # dir under EHG_STORE_DIR
-: ${EHG_CLONE_CMD:=hg clone} # clone cmd
-: ${EHG_PULL_CMD:=hg pull -u} # pull cmd
+: ${EHG_PROJECT:=$PN} # dir under EHG_STORE_DIR
+: ${EHG_CLONE_CMD:=hg clone --pull} # clone cmd
+: ${EHG_PULL_CMD:=hg pull -u} # pull cmd
# should be set but blank to prevent using $HOME/.hgrc
export HGRCPATH=