summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-12-24 00:14:04 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-12-24 01:15:05 +0100
commit8b34a2dff6a3789741cd53b63909cd81a7316f59 (patch)
tree5c758f3ba80be0fc310fd4658a0108955c9e8d5d
parentbfb9ae24146b1def10744f95609f185329d5466b (diff)
downloadsamba-8b34a2dff6a3789741cd53b63909cd81a7316f59.tar.gz
samba-8b34a2dff6a3789741cd53b63909cd81a7316f59.tar.bz2
samba-8b34a2dff6a3789741cd53b63909cd81a7316f59.zip
wafsamba: Fix handling of nick name in VERSION.
-rw-r--r--buildtools/wafsamba/samba_version.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 5804afbe4b..8d1bd32431 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -167,8 +167,7 @@ also accepted as dictionary entries here
self.STRING = SAMBA_VERSION_STRING
if self.RELEASE_NICKNAME is not None:
- self.STRING_WITH_NICKNAME += (" (" + self.RELEASE_NICKNAME + ")")
- self.RELEASE_NICKNAME = self.RELEASE_NICKNAME
+ self.STRING_WITH_NICKNAME = "%s (%s)" % (self.STRING, self.RELEASE_NICKNAME)
else:
self.STRING_WITH_NICKNAME = self.STRING