Skip to content

Fix false error in check_install_rpm #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atheurer merged 6 commits into from
Mar 10, 2016
Merged

Fix false error in check_install_rpm #182

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
509b864
Fix false error in check_install_rpm
atheurer Mar 8, 2016
a954fee
Add unittest gold file for check_install_rpm (thanks, NDK).
atheurer Mar 9, 2016
99613ad
DEBUG_MODE was set to 1, which should not be by default.
atheurer Mar 9, 2016
dc9096f
Update unittest files for PEBNCH-debug_mode=0
atheurer Mar 9, 2016
a8e2eca
Delete spurious exit in bench-scripts/unittests - fix gold dbench out…
ndokos Mar 9, 2016
a3802cf
Merge pull request #4 from portante/fix-pcp
atheurer Mar 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions agent/base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,21 +103,21 @@ function check_install_rpm {

rpm_status=`rpm --query ${this_rpm}$this_version`
if echo $rpm_status | grep -q "is not installed"; then
echo attempting to install ${this_rpm}$this_version
debug_log "[check_install_rpm] attempting to install ${this_rpm}$this_version"
yum --debuglevel=0 install -y ${this_rpm}$this_version >> $pbench_log 2>&1
rc=$?
else
local installed_rpm_version=`echo $rpm_status | awk -F- '{print $2"-"$3}'`
if [ "$this_version" != "$installed_rpm_version" ]; then
if [ ! -z "$this_version" -a "$this_version" != "$installed_rpm_version" ]; then
yum --debuglevel=0 install -y ${this_rpm}$this_version >> $pbench_log 2>&1
rc=$?
else
debug_log "$this_rpm has already been installed"
debug_log "[check_install_rpm] $this_rpm has already been installed"
rc=0
fi
fi
if [ $rc -ne 0 ]; then
error_log "[check_install_rpm]the installation of $this_rpm$this_version failed"
error_log "[check_install_rpm] the installation of $this_rpm$this_version failed"
return 1
else
return 0
Expand Down