From 7ae4372124a7fde2404f9e626054e7856c18f733 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 5 Apr 2010 09:58:23 +1000 Subject: s4-waf: fixed waf distcheck for our standalone libs and s4 --- buildtools/wafsamba/samba_dist.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'buildtools/wafsamba/samba_dist.py') diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py index 3663bc0bf5..e01bebe9ed 100644 --- a/buildtools/wafsamba/samba_dist.py +++ b/buildtools/wafsamba/samba_dist.py @@ -18,9 +18,13 @@ def add_tarfile(tar, fname, abspath): fh.close() -def dist(): - appname = Utils.g_module.APPNAME - version = Utils.g_module.VERSION +def dist(appname='',version=''): + if not isinstance(appname, str): + # this copes with a mismatch in the calling arguments for dist() + appname = Utils.g_module.APPNAME + version = Utils.g_module.VERSION + if not version: + version = Utils.g_module.VERSION srcdir = os.path.normpath(os.path.join(os.path.dirname(Utils.g_module.root_path), Utils.g_module.srcdir)) @@ -58,6 +62,7 @@ def dist(): tar.close() print('Created %s' % dist_name) + return dist_name @conf -- cgit