wafsamba: Fix handling of nick name in VERSION.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Dec 2010 23:14:04 +0000 (00:14 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 24 Dec 2010 00:15:05 +0000 (01:15 +0100)
buildtools/wafsamba/samba_version.py

index 5804afbe4bb408ff878631fcab3ed1ea8d36d7e6..8d1bd3243173824267d9f1710921569ea73d9aa0 100644 (file)
@@ -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