[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Oct 2 06:29:03 MDT 2012
The branch, master has been updated
via dce8a8e librelease.sh: Move the GPG data to the library section.
from f4b9007 s4-dns: fix a non handled memory out of memory
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit dce8a8e284e544999d85aa7df3ef97c3701742b4
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Oct 2 10:29:16 2012 +0200
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 <metze at samba.org>
(cherry picked from commit 7eb1f6ff178cb04a04dcaee88f15be850d239430)
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue Oct 2 14:28:10 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
script/librelease.sh | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/script/librelease.sh b/script/librelease.sh
index ac82762..5119ca4 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 <samba-bugs at samba.org>'
-}
-
-[ -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 <samba-bugs at samba.org>'
+ }
+
+ [ -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"
--
Samba Shared Repository
More information about the samba-cvs
mailing list