Patchwork arg-json-0001: Sync up with the json klog error log

login
register
mail settings
Submitter Keng-Yu Lin
Date Sept. 5, 2012, 9:07 a.m.
Message ID <1346836051-7186-1-git-send-email-kengyu@canonical.com>
Download mbox | patch
Permalink /patch/181786/
State Accepted
Headers show

Comments

Keng-Yu Lin - Sept. 5, 2012, 9:07 a.m.
Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
---
 arg-json-0001/klog-0003.log |    2 +-
 arg-json-0001/klog-0004.log |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Colin King - Sept. 5, 2012, 9:27 a.m.
On 05/09/12 10:07, Keng-Yu Lin wrote:
> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
> ---
>   arg-json-0001/klog-0003.log |    2 +-
>   arg-json-0001/klog-0004.log |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arg-json-0001/klog-0003.log b/arg-json-0001/klog-0003.log
> index fce0e32..e7dd812 100644
> --- a/arg-json-0001/klog-0003.log
> +++ b/arg-json-0001/klog-0003.log
> @@ -1,7 +1,7 @@
>   klog            Scan kernel log for errors and warnings.
>   klog            ----------------------------------------------------------
>   klog            Test 1 of 1: Kernel log error check.
> -klog            Cannot load klog data from /xxxx/fooo/klog.json.
> +klog            Cannot read file /xxxx/fooo/klog.json.
>   klog            Error parsing kernel log.
>   klog
>   klog            ==========================================================
> diff --git a/arg-json-0001/klog-0004.log b/arg-json-0001/klog-0004.log
> index fce0e32..e7dd812 100644
> --- a/arg-json-0001/klog-0004.log
> +++ b/arg-json-0001/klog-0004.log
> @@ -1,7 +1,7 @@
>   klog            Scan kernel log for errors and warnings.
>   klog            ----------------------------------------------------------
>   klog            Test 1 of 1: Kernel log error check.
> -klog            Cannot load klog data from /xxxx/fooo/klog.json.
> +klog            Cannot read file /xxxx/fooo/klog.json.
>   klog            Error parsing kernel log.
>   klog
>   klog            ==========================================================
>
Thanks again for fixing these up Keng-Yu, my mistake :-/

Acked-by: Colin Ian King <colin.king@canonical.com>
Alex Hung - Sept. 10, 2012, 2:50 a.m.
On 09/05/2012 05:07 PM, Keng-Yu Lin wrote:
> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
> ---
>   arg-json-0001/klog-0003.log |    2 +-
>   arg-json-0001/klog-0004.log |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arg-json-0001/klog-0003.log b/arg-json-0001/klog-0003.log
> index fce0e32..e7dd812 100644
> --- a/arg-json-0001/klog-0003.log
> +++ b/arg-json-0001/klog-0003.log
> @@ -1,7 +1,7 @@
>   klog            Scan kernel log for errors and warnings.
>   klog            ----------------------------------------------------------
>   klog            Test 1 of 1: Kernel log error check.
> -klog            Cannot load klog data from /xxxx/fooo/klog.json.
> +klog            Cannot read file /xxxx/fooo/klog.json.
>   klog            Error parsing kernel log.
>   klog
>   klog            ==========================================================
> diff --git a/arg-json-0001/klog-0004.log b/arg-json-0001/klog-0004.log
> index fce0e32..e7dd812 100644
> --- a/arg-json-0001/klog-0004.log
> +++ b/arg-json-0001/klog-0004.log
> @@ -1,7 +1,7 @@
>   klog            Scan kernel log for errors and warnings.
>   klog            ----------------------------------------------------------
>   klog            Test 1 of 1: Kernel log error check.
> -klog            Cannot load klog data from /xxxx/fooo/klog.json.
> +klog            Cannot read file /xxxx/fooo/klog.json.
>   klog            Error parsing kernel log.
>   klog
>   klog            ==========================================================
>

Acked-by: Alex Hung <alex.hung@canonical.com>

Patch

diff --git a/arg-json-0001/klog-0003.log b/arg-json-0001/klog-0003.log
index fce0e32..e7dd812 100644
--- a/arg-json-0001/klog-0003.log
+++ b/arg-json-0001/klog-0003.log
@@ -1,7 +1,7 @@ 
 klog            Scan kernel log for errors and warnings.
 klog            ----------------------------------------------------------
 klog            Test 1 of 1: Kernel log error check.
-klog            Cannot load klog data from /xxxx/fooo/klog.json.
+klog            Cannot read file /xxxx/fooo/klog.json.
 klog            Error parsing kernel log.
 klog            
 klog            ==========================================================
diff --git a/arg-json-0001/klog-0004.log b/arg-json-0001/klog-0004.log
index fce0e32..e7dd812 100644
--- a/arg-json-0001/klog-0004.log
+++ b/arg-json-0001/klog-0004.log
@@ -1,7 +1,7 @@ 
 klog            Scan kernel log for errors and warnings.
 klog            ----------------------------------------------------------
 klog            Test 1 of 1: Kernel log error check.
-klog            Cannot load klog data from /xxxx/fooo/klog.json.
+klog            Cannot read file /xxxx/fooo/klog.json.
 klog            Error parsing kernel log.
 klog            
 klog            ==========================================================