stephan/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'enhancement-package-pkg-openbsd' of https://github.com/ghettosh/cdist

Browse source
This commit is contained in:
Nico Schottelius 2014-03-26 11:06:22 +01:00
commit 58d57bc532
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cdist/conf/type/__package_pkg_openbsd/gencode-remote
View file

@ -69,12 +69,17 @@ case "$state_should" in
# use this because pkg_add doesn't properly handle errors
cat << eof
export PKG_PATH="$pkg_path"
status=\$(pkg_add "$pkgopts" "$name--$flavor")
status=\$(pkg_add "$pkgopts" "$name--$flavor" 2>&1)
pkg_info | grep "^${name}.*${flavor}" > /dev/null 2>&1
# no error
if [ -n "\$status" ]; then
# We didn't find the package in the list of 'installed packages', so it failed
# This is necessary because pkg_add doesn't return properly
if [ \$? -ne 0 ]; then
if [ -z "\${status}" ]; then
status="Failed to add package, uncaught exception."
fi
echo "Error: \$status"
exit 1
exit 1
fi
eof
;;
@ -83,9 +88,14 @@ eof
# use this because pkg_add doesn't properly handle errors
cat << eof
status=\$(pkg_delete "$pkgopts" "$name--$flavor")
pkg_info | grep "^${name}.*${flavor}" > /dev/null 2>&1
# no error
if [ -n "\$status" ]; then
# We found the package in the list of 'installed packages'
# This would indicate that pkg_delete failed, send the output of pkg_delete
if [ \$? -eq 0 ]; then
if [ -z "\${status}" ]; then
status="Failed to remove package, uncaught exception."
fi
echo "Error: \$status"
exit 1
fi