From dce8a8e284e544999d85aa7df3ef97c3701742b4 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Tue, 2 Oct 2012 10:29:16 +0200 Subject: [PATCH] librelease.sh: Move the GPG data to the library section. Don't use the Library key for the samba releases. Karolin Pair-Programmed-With: Stefan Metzmacher (cherry picked from commit 7eb1f6ff178cb04a04dcaee88f15be850d239430) Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Tue Oct 2 14:28:10 CEST 2012 on sn-devel-104 --- script/librelease.sh | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/script/librelease.sh b/script/librelease.sh index ac82762d307..5119ca4aca7 100755 --- a/script/librelease.sh +++ b/script/librelease.sh @@ -1,14 +1,6 @@ #!/bin/bash # make a release of a Samba library -[ -z "$GPG_USER" ] && { - GPG_USER='Samba Library Distribution Key ' -} - -[ -z "$GPG_KEYID" ] && { - GPG_KEYID='13084025' -} - if [ ! -d ".git" ]; then echo "Run this script from the top-level directory in the" echo "repository" @@ -67,6 +59,11 @@ release_lib() { exit 1 } + [ -z "$ftpdir" ] && { + popd + return 0 + } + echo "Push git tag $tagname" git push ssh://git.samba.org/data/git/samba.git refs/tags/$tagname:refs/tags/$tagname || { exit 1 @@ -84,10 +81,27 @@ release_lib() { for lib in $*; do case $lib in talloc | tdb | tevent | ldb) + [ -z "$GPG_USER" ] && { + GPG_USER='Samba Library Distribution Key ' + } + + [ -z "$GPG_KEYID" ] && { + GPG_KEYID='13084025' + } + release_lib $lib "lib/$lib" $lib ;; - samba4) - release_lib $lib "." "samba/$lib" + samba) + [ -z "$GPG_USER" ] && { + GPG_USER='6568B7EA' + } + + [ -z "$GPG_KEYID" ] && { + GPG_KEYID='6568B7EA' + } + + # for now we don't upload + release_lib $lib "." "" ;; *) echo "Unknown library $lib" -- 2.11.4.GIT