This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 0d5b8c145c95a1388fa006a45748712b8befa602 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Dec 4 05:04:16 2016 +0100 bin/{build-rpm-package,createsusetagsrepo}: move package signing to createsusetagsrepo script. Makes manually refreshing repositories easier. --- bin/build-rpm-package | 4 ---- bin/createsusetagsrepo | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 611b4b6..10383fb 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -1063,10 +1063,6 @@ upload_packages() { fi 0</dev/null ssh "${REPOS_SERVER}" "cd '${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/' && ~/bin/createsusetagsrepo '.' '${distro_string}' '${l_CODENAME}' '${gpg_sign_with}' '${use_sha256}'" - - # Sign repository data, otherwise zypper will fail adding the repository. - 0</dev/null ssh "${REPOS_SERVER}" "cd '${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/' && rm -f -- 'content.asc' && gpg -a -u '${gpg_sign_with}' --detach-sign 'content'" 1>/dev/null 2>/dev/null - 0</dev/null ssh "${REPOS_SERVER}" "cd '${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/' && test -e 'content.key' || gpg -a --output 'content.key' --export '${gpg_sign_with}'" fi done done diff --git a/bin/createsusetagsrepo b/bin/createsusetagsrepo index 8850a67..6401673 100755 --- a/bin/createsusetagsrepo +++ b/bin/createsusetagsrepo @@ -114,6 +114,11 @@ create_directory () { find "${prefix}" -print | sed -e "s#${prefix}##" | grep -vE '^$' | grep -v "^${file}$" > "${prefix}/${file}" } +sign_metadata () { + rm -f -- 'content.asc' && gpg -a -u "${gpg_key}" --detach-sign 'content' + test -e 'content.key' || gpg -a --output 'content.key' --export "${gpg_key}" +} + set -e repo_top_dir="${1}" @@ -143,4 +148,7 @@ create_descr create_directory +# Sign repository metadata, otherwise zypper will fail to refresh the repository. +sign_metadata + exit "0" -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git