1 |
floppym 12/02/05 19:14:16 |
2 |
|
3 |
Modified: ChangeLog mercurial.eclass |
4 |
Log: |
5 |
Don't die if hg pull exits with status 1. |
6 |
|
7 |
Revision Changes Path |
8 |
1.115 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.115&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.115&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.114&r2=1.115 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.114 |
18 |
retrieving revision 1.115 |
19 |
diff -u -r1.114 -r1.115 |
20 |
--- ChangeLog 4 Feb 2012 18:28:32 -0000 1.114 |
21 |
+++ ChangeLog 5 Feb 2012 19:14:16 -0000 1.115 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.114 2012/02/04 18:28:32 nirbheek Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.115 2012/02/05 19:14:16 floppym Exp $ |
27 |
+ |
28 |
+ 05 Feb 2012; Mike Gilbert <floppym@g.o> mercurial.eclass: |
29 |
+ Don't die if hg pull exits with status 1. |
30 |
|
31 |
04 Feb 2012; Nirbheek Chauhan <nirbheek@g.o> +mozlinguas.eclass: |
32 |
Add mozlinguas.eclass to handle language packs for mozilla products |
33 |
|
34 |
|
35 |
|
36 |
1.18 eclass/mercurial.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.18&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.18&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?r1=1.17&r2=1.18 |
41 |
|
42 |
Index: mercurial.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v |
45 |
retrieving revision 1.17 |
46 |
retrieving revision 1.18 |
47 |
diff -u -r1.17 -r1.18 |
48 |
--- mercurial.eclass 27 Dec 2011 17:55:12 -0000 1.17 |
49 |
+++ mercurial.eclass 5 Feb 2012 19:14:16 -0000 1.18 |
50 |
@@ -1,6 +1,6 @@ |
51 |
-# Copyright 1999-2011 Gentoo Foundation |
52 |
+# Copyright 1999-2012 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.17 2011/12/27 17:55:12 fauli Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.18 2012/02/05 19:14:16 floppym Exp $ |
56 |
|
57 |
# @ECLASS: mercurial.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -113,7 +113,9 @@ |
60 |
elif [[ -z "${EHG_OFFLINE}" ]]; then |
61 |
einfo "Updating ${EHG_STORE_DIR}/${EHG_PROJECT}/${module} from ${EHG_REPO_URI}" |
62 |
cd "${module}" || die "failed to cd to ${module}" |
63 |
- ${EHG_PULL_CMD} || die "update failed" |
64 |
+ ${EHG_PULL_CMD} |
65 |
+ # mercurial-2.1: hg pull returns 1 if there are no incoming changesets |
66 |
+ [[ $? -eq 0 || $? -eq 1 ]] || die "update failed" |
67 |
fi |
68 |
|
69 |
# Checkout working copy: |