openstack/devstack
Code Issues Proposed changes

Merge "Fix is_package_installed() check with dpkg"

Browse Source
This commit is contained in:
Jenkins 2013-08-29 04:51:52 +00:00 committed by Gerrit Code Review
commit 5584709fa8
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions
View File

@ -932,7 +932,7 @@ function is_package_installed() {
fi
if [[ "$os_PACKAGE" = "deb" ]]; then
dpkg -l "$@" > /dev/null 2> /dev/null
dpkg -s "$@" > /dev/null 2> /dev/null
elif [[ "$os_PACKAGE" = "rpm" ]]; then
rpm --quiet -q "$@"
else

22
tests/functions.sh
View File

@ -367,3 +367,25 @@ if [[ "$VAL" -ne 0 ]]; then
else
echo "is_package_installed() on non-existing package failed"
fi
# test against removed package...was a bug on Ubuntu
if is_ubuntu; then
PKG=cowsay
if ! (dpkg -s $PKG >/dev/null 2>&1); then
# it was never installed...set up the condition
sudo apt-get install -y cowsay >/dev/null 2>&1
fi
if (dpkg -s $PKG >/dev/null 2>&1); then
# remove it to create the 'un' status
sudo dpkg -P $PKG >/dev/null 2>&1
fi
# now test the installed check on a deleted package
is_package_installed $PKG
VAL=$?
if [[ "$VAL" -ne 0 ]]; then
echo "OK"
else
echo "is_package_installed() on deleted package failed"
fi
fi