[SCM] Samba Shared Repository - branch v3-4-test updated

Karolin Seeger kseeger at samba.org
Thu Mar 11 02:42:15 MST 2010


The branch, v3-4-test has been updated
       via  64fbfee... s3:release-scripts: fix create-tarball to treat vendor patch level correctly (cherry picked from commit b845025daf2da85eb1af6cbfa7878cf59a32f2a6) (cherry picked from commit 95c6a5a782caa77bc8bbe75de6ca249bc255507e)
      from  7586069... s3: re-run make samba3-idl.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 64fbfee4d322381b8b877feaf1f71b778a88b7f4
Author: Michael Adam <obnox at samba.org>
Date:   Mon Mar 8 23:37:21 2010 +0100

    s3:release-scripts: fix create-tarball to treat vendor patch level correctly
    (cherry picked from commit b845025daf2da85eb1af6cbfa7878cf59a32f2a6)
    (cherry picked from commit 95c6a5a782caa77bc8bbe75de6ca249bc255507e)

-----------------------------------------------------------------------

Summary of changes:
 release-scripts/create-tarball |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index bda5430..8a02d2b 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -196,7 +196,7 @@ function main
     if [ -n "$vendor_version" ]; then
 	version="$version-$vendor_version"
     fi
-    vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" $VER_H | awk '{print $3}'`
+    vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH_STRING" $VER_H | awk '{print $3}'`
     if [ -n "$vendor_patch" ]; then
 	version="$version-$vendor_patch"
     fi


-- 
Samba Shared Repository


More information about the samba-cvs mailing list