summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-09-20 15:24:44 -0700
committerJelmer Vernooij <jelmer@samba.org>2010-09-20 15:24:44 -0700
commitead126caace0cd94ab515f5d9f2199b60a84f914 (patch)
tree3778093012c4216674321416788072f497ac3a4b /buildtools
parent8853babb504298bd87fb5cae2120f2be63b08312 (diff)
parentdb67f43aefccccedbd8bf59c7d97c99295b7a168 (diff)
downloadsamba-ead126caace0cd94ab515f5d9f2199b60a84f914.tar.gz
samba-ead126caace0cd94ab515f5d9f2199b60a84f914.tar.bz2
samba-ead126caace0cd94ab515f5d9f2199b60a84f914.zip
Merge branch 'v4-0-stable' into newmaster
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_dist.py2
-rw-r--r--buildtools/wafsamba/samba_version.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index 54ca6c9e96..7cd4d54b01 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -167,7 +167,7 @@ def DIST_DIRS(dirs):
@conf
def DIST_BLACKLIST(blacklist):
- '''set the directories to package, relative to top srcdir'''
+ '''set the files to exclude from packaging, relative to top srcdir'''
global dist_blacklist
if not dist_blacklist:
dist_blacklist = blacklist
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 0128670bab..82f882f646 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -27,9 +27,9 @@ also accepted as dictionary entries here
else:
setattr(self, a, b)
- if self.IS_GIT_SNAPSHOT is "yes":
+ if self.IS_GIT_SNAPSHOT == "yes":
self.IS_GIT_SNAPSHOT=True
- elif self.IS_GIT_SNAPSHOT is "no":
+ elif self.IS_GIT_SNAPSHOT == "no":
self.IS_GIT_SNAPSHOT=False
##