diff options
Diffstat (limited to 'meta-networking/recipes-connectivity/samba/samba-4.1.12/0007-waf-Fix-parsing-of-cross-answers-file-in-case-answer.patch')
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba-4.1.12/0007-waf-Fix-parsing-of-cross-answers-file-in-case-answer.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba-4.1.12/0007-waf-Fix-parsing-of-cross-answers-file-in-case-answer.patch b/meta-networking/recipes-connectivity/samba/samba-4.1.12/0007-waf-Fix-parsing-of-cross-answers-file-in-case-answer.patch deleted file mode 100644 index de0d32c780..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba-4.1.12/0007-waf-Fix-parsing-of-cross-answers-file-in-case-answer.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From 649c731526dc1473bd1804d2903d7559e63616da Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Uri Simchoni <urisimchoni@gmail.com> | ||
| 3 | Date: Mon, 4 May 2015 09:12:45 +0300 | ||
| 4 | Subject: [PATCH 7/7] waf: Fix parsing of cross-answers file in case answer includes a colon | ||
| 5 | |||
| 6 | The answer provided in the cross-answers file may include a colon, | ||
| 7 | as in: | ||
| 8 | Checking uname version type: "#57-Ubuntu SMP Tue Jul 15 03:51:08 UTC 2014" | ||
| 9 | |||
| 10 | Signed-off-by: Uri Simchoni <urisimchoni@gmail.com> | ||
| 11 | Reviewed-by: Andrew Bartlett <abartlet@samba.org> | ||
| 12 | Reviewed-by: Alexander Bokovoy <ab@samba.org> | ||
| 13 | |||
| 14 | Upstream-Status: Backport | ||
| 15 | |||
| 16 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
| 17 | --- | ||
| 18 | buildtools/wafsamba/samba_cross.py | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py | ||
| 22 | index d1e7006..7961212 100644 | ||
| 23 | --- a/buildtools/wafsamba/samba_cross.py | ||
| 24 | +++ b/buildtools/wafsamba/samba_cross.py | ||
| 25 | @@ -54,7 +54,7 @@ def cross_answer(ca_file, msg): | ||
| 26 | if line == '' or line[0] == '#': | ||
| 27 | continue | ||
| 28 | if line.find(':') != -1: | ||
| 29 | - a = line.split(':') | ||
| 30 | + a = line.split(':', 1) | ||
| 31 | thismsg = a[0].strip() | ||
| 32 | if thismsg != msg: | ||
| 33 | continue | ||
| 34 | -- | ||
| 35 | 1.9.1 | ||
| 36 | |||
