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

bugfix emerge type for slotted packages

Browse source
This commit is contained in:
Daniel Heule 2014-06-09 15:42:17 +02:00
parent 004e90e9b9
commit 9bac6da6c9
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cdist/conf/type/__package_emerge/gencode-remote
View file

@ -33,26 +33,32 @@ else
state_should="present" state_should="present"
fi fi
if [ -f "$__object/parameter/version" ]; then
version="$(cat "$__object/parameter/version")"
else
version=""
fi
if [ ! -z "$version" ]; then
name="=$name-$version"
fi
pkg_version="$(cat "$__object/explorer/pkg_version")" pkg_version="$(cat "$__object/explorer/pkg_version")"
if [ -z "$pkg_version" ]; then if [ -z "$pkg_version" ]; then
state_is="absent" state_is="absent"
elif [ $(echo "$pkg_version" | wc -l) -gt 1 ]; then elif [ ! -z "$version" -a $(echo "$pkg_version" | wc -l) -gt 1 ]; then
echo "Package name is not unique! The following packages are installed:"
echo "$pkg_version"
exit 1
elif [ -z "$version" -a $(echo "$pkg_version" | cut -d " " -f 1 | sort | uniq | wc -l) -gt 1 ]; then
echo "Package name is not unique! The following packages are installed:" echo "Package name is not unique! The following packages are installed:"
echo "$pkg_version" echo "$pkg_version"
exit 1 exit 1
else else
state_is="present" state_is="present"
installed_version="$(echo "$pkg_version" | cut -d " " -f 2)" installed_version="$(echo "$pkg_version" | cut -d " " -f 2 | tail -n 1)"
fi fi
if [ -f "$__object/parameter/version" ]; then
version="$(cat "$__object/parameter/version")"
if [ ! -z "$version" ]; then
name="=$name-$version"
fi
else
version=""
fi
# Exit if nothing is needed to be done # Exit if nothing is needed to be done
[ "$state_is" = "$state_should" ] && ( [ -z "$version" ] || [ "$installed_version" = "$version" ] ) && exit 0 [ "$state_is" = "$state_should" ] && ( [ -z "$version" ] || [ "$installed_version" = "$version" ] ) && exit 0