tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Minor fixes

Browse source 
Fixed pkgng_exists explorer (can't reference $__global)
Fixed logic in __package/pkgng_freebsd/gencode-remote
   Wasn't installing package if it already exists, but after explorer execution
This commit is contained in:
Jake Guffey 2014-09-10 15:54:13 -04:00
parent e87b26f2de
commit 37a8b4af2b
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cdist/conf/type/__package/explorer/pkgng_exists
View file

@ -21,7 +21,9 @@
# Retrieve the status of a package - parsed dpkg output # Retrieve the status of a package - parsed dpkg output
# #
if [ "$(cat "$__global/explorer/os")" = "freebsd" ]; then # Can't access $__global/explorer/os from here, so recreate the functionality
# because there's no point in executing this explorer on non-FreeBSD targets.
if [ $(uname) = "FreeBSD" ]; then
if command -v pkg >&-; then if command -v pkg >&-; then
printf "pkg-ng installed" printf "pkg-ng installed"
else else

7
cdist/conf/type/__package_pkgng_freebsd/gencode-remote
View file

@ -99,15 +99,20 @@ if [ -n "$curr_version" ]; then # PKG *is* installed
if [ -n "$flavor" ]; then if [ -n "$flavor" ]; then
cmd="${cmd}-${flavor}" cmd="${cmd}-${flavor}"
fi fi
# PKG is supposed to be removed
if [ "$state" = "absent" ]; then if [ "$state" = "absent" ]; then
execcmd "rm" "${cmd}" execcmd "rm" "${cmd}"
elif [ "$version" != "$curr_version" ]; then # PKG is supposed to be installed to a particular version
elif [ -n "$version" ] && [ "$version" != "$curr_version" ]; then
if [ "$upgrade" = "true" ]; then if [ "$upgrade" = "true" ]; then
execcmd "upg" "${cmd}" execcmd "upg" "${cmd}"
else else
printf "Version %s is already installed and pkg-ng can't upgrade directly to version %s.\nTo upgrade to the latest version, use the --upgrade flag.\n" "$curr_version" "$version" >&2 printf "Version %s is already installed and pkg-ng can't upgrade directly to version %s.\nTo upgrade to the latest version, use the --upgrade flag.\n" "$curr_version" "$version" >&2
exit 1 exit 1
fi fi
# PKG is supposed to be installed to the latest version
else
: # Do nothing.
fi fi
else # PKG *isn't* installed else # PKG *isn't* installed
if [ "$state" = "absent" ]; then # Shouldn't be installed if [ "$state" = "absent" ]; then # Shouldn't be installed