From dfe9e08c280a2a3bc0ded15069b7d60df5a757f8 Mon Sep 17 00:00:00 2001 From: Dennis Camera Date: Sun, 25 Oct 2020 11:06:05 +0100 Subject: [PATCH] [type/__uci_commit] Delete type --- cdist/conf/type/__uci/man.rst | 2 - cdist/conf/type/__uci/manifest | 18 ----- cdist/conf/type/__uci_commit/gencode-remote | 81 --------------------- cdist/conf/type/__uci_commit/man.rst | 60 --------------- cdist/conf/type/__uci_commit/nonparallel | 0 5 files changed, 161 deletions(-) delete mode 100755 cdist/conf/type/__uci_commit/gencode-remote delete mode 100644 cdist/conf/type/__uci_commit/man.rst delete mode 100644 cdist/conf/type/__uci_commit/nonparallel diff --git a/cdist/conf/type/__uci/man.rst b/cdist/conf/type/__uci/man.rst index 8c3f79f1..81a53473 100644 --- a/cdist/conf/type/__uci/man.rst +++ b/cdist/conf/type/__uci/man.rst @@ -58,13 +58,11 @@ EXAMPLES --value '1.openwrt.pool.ntp.org' \ --value '2.openwrt.pool.ntp.org' \ --value '3.openwrt.pool.ntp.org' - export require=__uci_commit/ntp SEE ALSO -------- - https://openwrt.org/docs/guide-user/base-system/uci -- :strong:`cdist-type__uci_commit`\ (7) AUTHORS diff --git a/cdist/conf/type/__uci/manifest b/cdist/conf/type/__uci/manifest index d0c8239e..26920011 100755 --- a/cdist/conf/type/__uci/manifest +++ b/cdist/conf/type/__uci/manifest @@ -18,15 +18,9 @@ # along with cdist. If not, see . # -# shellcheck source=files/functions.sh -. "${__type:?}/files/functions.sh" - - os=$(cat "${__global:?}/explorer/os") -state_is=$(cat "${__object:?}/explorer/state") state_should=$(cat "${__object:?}/parameter/state") -transaction_name=$(cat "${__object:?}/parameter/transaction") case ${os} in @@ -40,8 +34,6 @@ in ;; esac -changes_required=false - case ${state_should} in (present) @@ -49,21 +41,11 @@ in echo 'The parameter --value is required.' >&2 exit 1 } - - # NOTE: order is ignored so rearranged is also fine. - in_list "${state_is}" 'present' 'rearranged' || changes_required=true ;; (absent) - in_list "${state_is}" 'absent' || changes_required=true ;; (*) printf 'Invalid --state: %s\n' "${state_should}" >&2 exit 1 ;; esac - -if ${changes_required} -then - # Make sure the changes are being committed - require=${__object_name:?} __uci_commit "${transaction_name}" -fi diff --git a/cdist/conf/type/__uci_commit/gencode-remote b/cdist/conf/type/__uci_commit/gencode-remote deleted file mode 100755 index e5c93966..00000000 --- a/cdist/conf/type/__uci_commit/gencode-remote +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -e -# -# 2020 Dennis Camera (dennis.camera@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 . -# - -transaction_name=${__object_id:?} -batchfile="${__global:?}/tmp/__uci/${transaction_name}.txt" - -test -s "${batchfile}" || exit 0 - -printf 'commit transaction %s\n' "${transaction_name}" >>"${__messages_out:?}" - -# NOTE: Uncommited changes are checked in code-remote instead of in an explorer -# because in cdist there is no interlocking between explorers and code -# execution. -# Checking for uncommited changes in an explorer leaves a time slot in -# which changes made are not detected by the code. -# Furthermore an explorer running concurrently with another transactions -# code-remote could lead to a false positive. - -cat <&2 - -check_errors() { - # reads stdin and forwards non-empty lines to stderr. - # returns 0 if stdin is empty, else 1. - ! grep -e . >&2 -} - -commit() { - uci commit -} - -rollback() { - echo >&2 - echo 'An error occurred when trying to commit transaction ${transaction_name}!' >&2 - - uci changes \\ - | sed -e 's/^-//' -e 's/\..*\$//' \\ - | sort -u \\ - | while read -r _package - do - uci revert "\${_package}" - echo "\${_package}" # for logging - done \\ - | awk ' - BEGIN { printf "Reverted changes in: " } - { printf "%s%s", (FNR > 1 ? ", " : ""), \$0 } - END { printf "\\n" }' >&2 - - return 1 -} - -uci batch <<'EOF' 2>&1 | check_errors && commit || rollback -$(cat "${batchfile}") -EOF -CODE diff --git a/cdist/conf/type/__uci_commit/man.rst b/cdist/conf/type/__uci_commit/man.rst deleted file mode 100644 index ea6611eb..00000000 --- a/cdist/conf/type/__uci_commit/man.rst +++ /dev/null @@ -1,60 +0,0 @@ -cdist-type__uci_commit(7) -========================= - -NAME ----- -cdist-type__uci_commit - Commit UCI transactions - - -DESCRIPTION ------------ -This type executes the ``uci commit`` command on the target with the commands -queued in a transaction. -It is usually not required to use this type. Use the ``--transaction`` parameter -of :strong:`cdist-type__uci`\ (7) and :strong:`cdist-type__uci_section`\ (7) -instead. - - -REQUIRED PARAMETERS -------------------- -None. - - -OPTIONAL PARAMETERS -------------------- -None. - - -BOOLEAN PARAMETERS ------------------- -None. - - -EXAMPLES --------- - -.. code-block:: sh - - # Commit the default transaction - __uci_commit default - - # Commit another transaction - __uci_commit my_transaction - - -SEE ALSO --------- -:strong:`cdist-type__uci`\ (7), :strong:`cdist-type__uci_section`\ (7) - - -AUTHORS -------- -Dennis Camera - - -COPYING -------- -Copyright \(C) 2020 Dennis Camera. 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. diff --git a/cdist/conf/type/__uci_commit/nonparallel b/cdist/conf/type/__uci_commit/nonparallel deleted file mode 100644 index e69de29b..00000000