[type/__uci_commit] Abort if uncommited changes are present on the target

This commit is contained in:
Dennis Camera 2020-06-17 13:00:24 +02:00
parent 3a3be36310
commit e7369a1f99
2 changed files with 39 additions and 8 deletions

View file

@ -0,0 +1,22 @@
#!/bin/sh
#
# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
# This explorer outputs the uncommited UCI changes on the target.
uci changes

View file

@ -23,20 +23,29 @@ batchfile="${__global:?}/tmp/__uci/${transaction_name}.txt"
test -s "${batchfile}" || exit 0 test -s "${batchfile}" || exit 0
if test -s "${__object:?}/explorer/changes"
then
echo 'Uncommited UCI changes were found on the target:'
cat "${__object:?}/explorer/changes"
echo
echo 'This can be caused by manual changes or due to a previous failed run.'
echo 'Please investigate the situation, revert or commit the changes, and try again.'
exit 1
fi >&2
printf 'commit transaction %s\n' "${transaction_name}" >>"${__messages_out:?}" printf 'commit transaction %s\n' "${transaction_name}" >>"${__messages_out:?}"
cat <<'EOF' cat <<CODE
rollback() { rollback() {
uci changes \ uci changes \\
| sed -e 's/\..*$//' -e 's/^-//' \ | sed -e 's/\..*\$//' -e 's/^-//' \\
| while read -r package | while read -r package
do do
uci revert "${package}" uci revert "\${package}"
done done
} }
uci batch <<'EOF' && uci commit || rollback
$(cat "${batchfile}")
EOF EOF
CODE
echo "uci batch <<'EOF' && uci commit || rollback"
cat "${batchfile}"
echo 'EOF'