Re: [PATCH 0/1] ADT: Fix script check_result error

Re: [PATCH 0/1] ADT: Fix script check_result error

[Richard Purdie]

On Tue, 2011-02-22 at 05:54 +0800, Liping Ke wrote:
> From: Liping Ke <liping.ke@intel.com>
> 
> When meeting errors, the return number can't be directly compared with
> "-1". The correct way is to compare it with 0. If the result is a non-zero
> number, we meet error. This patch is for fixing [BUGID #742]
> 
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: lke/adt-fix
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lke/adt-fix
> 
> Thanks,
>     Liping Ke <liping.ke@intel.com>
> ---
> 
> 
> Liping Ke (1):
>   ADT: Fix check_result script cond comparison bug
> 
>  .../installer/adt-installer/scripts/util           |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)

Merged to master, thanks.

Richard

[PATCH 0/1] ADT: Fix script check_result error

[Liping Ke]

From: Liping Ke <liping.ke@intel.com>

When meeting errors, the return number can't be directly compared with
"-1". The correct way is to compare it with 0. If the result is a non-zero
number, we meet error. This patch is for fixing [BUGID #742]


Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: lke/adt-fix
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lke/adt-fix

Thanks,
    Liping Ke <liping.ke@intel.com>
---


Liping Ke (1):
  ADT: Fix check_result script cond comparison bug

 .../installer/adt-installer/scripts/util           |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

[PATCH 1/1] ADT: Fix check_result script cond comparison bug

[Liping Ke]

From: Liping Ke <liping.ke@intel.com>

When meeting errors, the return number can't be directly compared with
"-1". The correct way is to compare it with 0. If the result is a non-zero
number, we meet error. This patch is for fixing [BUGID #742]

Signed-off-by: Liping Ke <liping.ke@intel.coom>
---
 .../installer/adt-installer/scripts/util           |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/util b/meta/recipes-devtools/installer/adt-installer/scripts/util
index 4b88fee..9be7517 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/util
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/util
@@ -84,14 +84,14 @@ done
 
 check_result()
 {
-  result="$?"
-  if [  "$result" == "-1" ]; then
+  result=$?
+  if [ $result -eq 1 ]; then
+    exit -1
+  elif [  $result -ne 0 ]; then
      echo_info "\n#############################################################################"
      echo_info "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
      echo_info "#############################################################################\n"
     exit -1
-  elif [ "$result" == "1" ]; then
-    exit -1
   fi
 }
 
-- 
1.7.0.4