Gentoo Archives: gentoo-commits

From: Christoph Junghans <ottxor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/, sys-cluster/charm/files/
Date: Fri, 27 Sep 2013 16:18:57
Message-Id: 1380298724.ebd74b77022f4ed4d46c764679a20482ccd9e1f5.ottxor@gentoo
1 commit: ebd74b77022f4ed4d46c764679a20482ccd9e1f5
2 Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 27 16:18:01 2013 +0000
4 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 27 16:18:44 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ebd74b77
7
8 fix broken patch
9
10 Package-Manager: portage-2.2.1
11
12 ---
13 sys-cluster/charm/ChangeLog | 4 ++++
14 sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch | 2 +-
15 2 files changed, 5 insertions(+), 1 deletion(-)
16
17 diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
18 index 618de1d..2ff10b6 100644
19 --- a/sys-cluster/charm/ChangeLog
20 +++ b/sys-cluster/charm/ChangeLog
21 @@ -2,6 +2,10 @@
22 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
23 # $Header: $
24
25 + 27 Sep 2013; Christoph Junghans <ottxor@g.o>
26 + files/charm-6.5.1-fix-string-parsing.patch:
27 + fix broken patch
28 +
29 14 Sep 2013; Nicolas Bock <nicolasbock@×××××.com>
30 files/charm-6.5.1-fix-string-parsing.patch:
31 sys-cluster/charm-6.5.1: Small fix in patch to make printing less verbose.
32
33 diff --git a/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch b/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch
34 index 06bdf0d..50fd596 100644
35 --- a/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch
36 +++ b/sys-cluster/charm/files/charm-6.5.1-fix-string-parsing.patch
37 @@ -15,7 +15,7 @@ diff --git a/src/arch/net/charmrun/charmrun.c b/src/arch/net/charmrun/charmrun.c
38 index 6837712..bf370c1 100644
39 --- a/src/arch/net/charmrun/charmrun.c
40 +++ b/src/arch/net/charmrun/charmrun.c
41 -@@ -454,8 +454,28 @@ static int pparam_setdef(def, value)
42 +@@ -454,8 +454,27 @@ static int pparam_setdef(def, value)
43 if (*p) return -1;
44 return 0;
45 case 's' :