From faf9935347243464dccfe8a3297753e02b2a4163 Mon Sep 17 00:00:00 2001 From: ellen56 Date: Mon, 10 Oct 2011 08:36:32 +0000 Subject: [PATCH] fix some message error git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10727 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT/postscripts/otherpkgs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/xCAT/postscripts/otherpkgs b/xCAT/postscripts/otherpkgs index b8a2dad83..7d551bebd 100755 --- a/xCAT/postscripts/otherpkgs +++ b/xCAT/postscripts/otherpkgs @@ -493,7 +493,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do #Now we have parsed the input, let's remove rpms if is specified with - if [ "$repo_pkgs_preremove" != "" ]; then if [ $hasyum -eq 1 ]; then - echo "eval $envlist yum -y remove $repo_pkgs_preremove" + echo "$envlist yum -y remove $repo_pkgs_preremove" result=`eval $envlist yum -y remove $repo_pkgs_preremove 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then @@ -501,7 +501,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do fi echo "$result" elif [ $haszypper -eq 1 ]; then - echo "eval $envlist zypper remove -y $repo_pkgs_preremove" + echo "$envlist zypper remove -y $repo_pkgs_preremove" result=`eval $envlist zypper remove -y $repo_pkgs_preremove 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then @@ -521,7 +521,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do fi if [ "$plain_pkgs_preremove" != "" ]; then - echo "eval $envlist $sremovecommand $plain_pkgs_preremove" + echo "$envlist $sremovecommand $plain_pkgs_preremove" result=`eval $envlist $sremovecommand $plain_pkgs_preremove 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then @@ -534,7 +534,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do #installation using yum or zypper if [ "$repo_pkgs" != "" ]; then if [ $hasyum -eq 1 ]; then - echo "eval $envlist yum -y install $repo_pkgs" + echo "$envlist yum -y install $repo_pkgs" result=`eval $envlist yum -y install $repo_pkgs 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then @@ -542,7 +542,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do fi echo "$result" elif [ $haszypper -eq 1 ]; then - echo "eval $envlist zypper install -y $repo_pkgs" + echo "$envlist zypper install -y $repo_pkgs" result=`eval $envlist zypper install -y $repo_pkgs 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then @@ -557,7 +557,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do #done elif [ $hasapt -eq 1 ]; then apt_get_update_if_repos_changed $REPOFILE - echo "eval $envlist apt-get -q -y --force-yes install $repo_pkgs" + echo "$envlist apt-get -q -y --force-yes install $repo_pkgs" result=`eval $envlist apt-get -q -y --force-yes install $repo_pkgs 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then @@ -589,7 +589,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do cd $OTHERPKGDIR fi - echo "eval $envlist $supdatecommand $plain_pkgs" + echo "$envlist $supdatecommand $plain_pkgs" result=`eval $envlist $supdatecommand $plain_pkgs 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then @@ -608,7 +608,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do #remove more rpms if specified with -- if [ "$repo_pkgs_postremove" != "" ]; then if [ $hasyum -eq 1 ]; then - echo "eval $envlist yum -y remove $repo_pkgs_postremove" + echo "$envlist yum -y remove $repo_pkgs_postremove" result=`eval $envlist yum -y remove $repo_pkgs_postremove 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then @@ -616,7 +616,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do fi echo "$result" elif [ $haszypper -eq 1 ]; then - echo "eval $envlist zypper remove -y $repo_pkgs_postremove" + echo "$envlist zypper remove -y $repo_pkgs_postremove" result=`eval $envlist zypper remove -y $repo_pkgs_postremove 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then @@ -625,7 +625,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do echo "$result" elif [ $hasapt -eq 1 ]; then apt_get_update_if_repos_changed $REPOFILE - echo "eval $envlist apt-get -y remove $repo_pkgs_postremove" + echo "$envlist apt-get -y remove $repo_pkgs_postremove" result=`eval $envlist apt-get -y remove $repo_pkgs_postremove 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then @@ -636,7 +636,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do fi if [ "$plain_pkgs_postremove" != "" ]; then - echo "eval $envlist $sremovecommand $plain_pkgs_postremove" + echo "$envlist $sremovecommand $plain_pkgs_postremove" result=`eval $envlist $sremovecommand $plain_pkgs_postremove 2>&1` logger -t xcat "$result" if [ $? -ne 0 ]; then