thijso/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Bugfix to auto import pgp keys for new repos, so we can add repos with new keys

Browse source
This commit is contained in:
Daniel Heule 2014-04-29 11:49:43 +02:00
parent 702a07b2d1
commit 5a647ec763
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__zypper_repo/gencode-remote
View file

@ -25,7 +25,7 @@
#exec >&2 #exec >&2
#set -x #set -x
zypper_def_opts=" -q " zypper_def_opts=" -q --non-interactive --gpg-auto-import-keys "
if [ -f "$__object/parameter/repo_desc" ]; then if [ -f "$__object/parameter/repo_desc" ]; then
desc="$(cat "$__object/parameter/repo_desc")" desc="$(cat "$__object/parameter/repo_desc")"

4
cdist/conf/type/__zypper_service/gencode-remote
View file

@ -25,7 +25,7 @@
#exec >&2 #exec >&2
#set -x #set -x
zypper_def_opts=" -q " zypper_def_opts=" -q --non-interactive --gpg-auto-import-keys "
if [ -f "$__object/parameter/service_desc" ]; then if [ -f "$__object/parameter/service_desc" ]; then
desc="$(cat "$__object/parameter/service_desc")" desc="$(cat "$__object/parameter/service_desc")"
@ -73,10 +73,12 @@ case "$state_should" in
present) present)
echo zypper $zypper_def_opts addservice -t "$stype" "$uri" \"$desc\" echo zypper $zypper_def_opts addservice -t "$stype" "$uri" \"$desc\"
echo zypper $zypper_def_opts refs echo zypper $zypper_def_opts refs
echo zypper $zypper_def_opts ref
;; ;;
absent) absent)
echo zypper $zypper_def_opts removeservice "$service_id" echo zypper $zypper_def_opts removeservice "$service_id"
echo zypper $zypper_def_opts refs echo zypper $zypper_def_opts refs
echo zypper $zypper_def_opts ref
;; ;;
*) *)
echo "Unknown state: $state_should" >&2 echo "Unknown state: $state_should" >&2

1
cdist/conf/type/__zypper_service/manifest
View file

@ -25,7 +25,6 @@
#exec >&2 #exec >&2
#set -x #set -x
zypper_def_opts=" -q "
if [ -f "$__object/parameter/service_uri" ]; then if [ -f "$__object/parameter/service_uri" ]; then
uri="$(cat "$__object/parameter/service_uri")" uri="$(cat "$__object/parameter/service_uri")"