[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Mon Mar 8 15:40:31 MST 2010


The branch, master has been updated
       via  b845025... s3:release-scripts: fix create-tarball to treat vendor patch level correctly
      from  8a76352... samba: remove Linux cifs-utils files from samba master branch

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b845025daf2da85eb1af6cbfa7878cf59a32f2a6
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

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

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 9e6b8fe..94525e0 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