git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3f1a78
)
s3:release-scripts: fix create-tarball to treat vendor patch level correctly
author
Michael Adam
<obnox@samba.org>
Mon, 8 Mar 2010 22:37:21 +0000
(23:37 +0100)
committer
Karolin Seeger
<kseeger@samba.org>
Thu, 6 May 2010 12:08:33 +0000
(14:08 +0200)
(cherry picked from commit
b845025daf2da85eb1af6cbfa7878cf59a32f2a6
)
(cherry picked from commit
95c6a5a782caa77bc8bbe75de6ca249bc255507e
)
(cherry picked from commit
64fbfee4d322381b8b877feaf1f71b778a88b7f4
)
release-scripts/create-tarball
patch
|
blob
|
history
diff --git
a/release-scripts/create-tarball
b/release-scripts/create-tarball
index bda5430a1924eeb278347b85f1caf45540ce069e..8a02d2bdb36d1172a8ff4d4c9dd64fd2dd78f591 100755
(executable)
--- 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