From 8b34a2dff6a3789741cd53b63909cd81a7316f59 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 24 Dec 2010 00:14:04 +0100
Subject: wafsamba: Fix handling of nick name in VERSION.

---
 buildtools/wafsamba/samba_version.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'buildtools')

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
 
-- 
cgit