ungleich-public/cdist
ungleich-public/cdist
7
4
Fork 10
Code Issues 58 Pull requests 15 Projects Releases Wiki Activity

[type/__package_opkg] Fix explorer running in parallel

Browse source
This commit is contained in:
Dennis Camera 2020-06-20 21:11:28 +02:00
parent 955243a93b
commit 97e48be39e
1 changed files with 44 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
cdist/conf/type/__package_opkg/explorer/pkg_status
View file

@ -1,7 +1,8 @@
#!/bin/sh #!/bin/sh -e
# #
# 2011 Nico Schottelius (nico-cdist at schottelius.org) # 2011 Nico Schottelius (nico-cdist at schottelius.org)
# 2012 Giel van Schijndel (giel plus cdist at mortis dot eu) # 2012 Giel van Schijndel (giel plus cdist at mortis dot eu)
# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -19,21 +20,51 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# #
# Retrieve the status of a package - parsed opkg output # Retrieve the status of a package - parses opkg output
# #
if [ -f "$__object/parameter/name" ]; then LOCKFILE="${__type_explorer}/cdist_opkg.lock"
name="$(cat "$__object/parameter/name")" _lock() (
set -o noclobber
until echo $$>"${LOCKFILE}"
do
while test -f "${LOCKFILE}"; do sleep 1; done
done
) 2>/dev/null
_unlock() {
if test -s "${LOCKFILE}" && test "$(cat "${LOCKFILE}")" = $$
then
rm "${LOCKFILE}"
fi
}
if test -f "${__object}/parameter/name"
then
pkg_name=$(cat "${__object}/parameter/name")
else else
name="$__object_id" pkg_name=$__object_id
fi fi
# Except dpkg failing, if package is not known / installed
if opkg status "$name" 2>/dev/null | grep -q "^Status: install user installed$"; then # NOTE: We need to lock parallel execution of this explorer because opkg will
echo "present" # try to acquire the OPKG lock (usually /var/lock/opkg.lock) using lockf(2) for
exit 0 # every operation. It will not wait for the lock but terminate with an error.
elif [ "$(opkg info "$name" 2> /dev/null | wc -l)" -eq 0 ]; then # This leads to incorrect 'absent notpresent' statuses when parallel execution
echo "absent notpresent" # is enabled.
exit 0 trap _unlock EXIT
_lock
# Except opkg failing, if package is not known / installed
if opkg status "${pkg_name}" 2>/dev/null \
| grep -q -e '^Status: [^ ][^ ]* [^ ][^ ]* installed$'
then
echo 'present'
elif opkg info "${pkg_name}" 2>/dev/null | grep -q .
then
echo 'absent notpresent'
else
echo 'absent'
fi fi
echo "absent"