diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-02-05 19:14:16 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-02-05 19:14:16 +0000 |
| commit | 73e50a1a99636b1bf3f171d2e67d447c92d22ba0 (patch) | |
| tree | 060ab64becefecd1648e20bd32a5aab1bb13c4da /eclass | |
| parent | Drop sparc keywords (diff) | |
| download | historical-73e50a1a99636b1bf3f171d2e67d447c92d22ba0.tar.gz historical-73e50a1a99636b1bf3f171d2e67d447c92d22ba0.tar.bz2 historical-73e50a1a99636b1bf3f171d2e67d447c92d22ba0.zip | |
Don't die if hg pull exits with status 1.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/mercurial.eclass | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 1dccb79169df..6d81a5007483 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.114 2012/02/04 18:28:32 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.115 2012/02/05 19:14:16 floppym Exp $ + + 05 Feb 2012; Mike Gilbert <floppym@gentoo.org> mercurial.eclass: + Don't die if hg pull exits with status 1. 04 Feb 2012; Nirbheek Chauhan <nirbheek@gentoo.org> +mozlinguas.eclass: Add mozlinguas.eclass to handle language packs for mozilla products diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass index a68691507338..ef55d816aed6 100644 --- a/eclass/mercurial.eclass +++ b/eclass/mercurial.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.17 2011/12/27 17:55:12 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.18 2012/02/05 19:14:16 floppym Exp $ # @ECLASS: mercurial.eclass # @MAINTAINER: @@ -113,7 +113,9 @@ function mercurial_fetch { elif [[ -z "${EHG_OFFLINE}" ]]; then einfo "Updating ${EHG_STORE_DIR}/${EHG_PROJECT}/${module} from ${EHG_REPO_URI}" cd "${module}" || die "failed to cd to ${module}" - ${EHG_PULL_CMD} || die "update failed" + ${EHG_PULL_CMD} + # mercurial-2.1: hg pull returns 1 if there are no incoming changesets + [[ $? -eq 0 || $? -eq 1 ]] || die "update failed" fi # Checkout working copy: |