[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Wed Dec 26 14:36:02 MST 2012


The branch, master has been updated
       via  f2a6afb selftest.pl: Fix typo 'snprintf' -> 'sprintf'.
       via  e1a819e wafsamba: python-config is not always a script.
      from  c1fb37d Recent coverity changes added directory_create_or_exist() checks to many directories.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f2a6afb87e8b968681fbe0a178e76cddc680953f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Dec 15 22:16:28 2012 +0100

    selftest.pl: Fix typo 'snprintf' -> 'sprintf'.
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Wed Dec 26 22:35:12 CET 2012 on sn-devel-104

commit e1a819ea18aa3ecfcddb76ec681f520db162338e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Dec 16 15:01:53 2012 +0100

    wafsamba: python-config is not always a script.

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafadmin/Tools/python.py |    2 +-
 selftest/selftest.pl                |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py
index c2af312..a15e1f6 100644
--- a/buildtools/wafadmin/Tools/python.py
+++ b/buildtools/wafadmin/Tools/python.py
@@ -259,7 +259,7 @@ MACOSX_DEPLOYMENT_TARGET = %r
 
 	includes = []
 	if python_config:
-		for incstr in Utils.cmd_output("%s %s --includes" % (python, python_config)).strip().split():
+		for incstr in Utils.cmd_output("%s --includes" % (python_config,)).strip().split():
 			# strip the -I or /I
 			if (incstr.startswith('-I')
 			    or incstr.startswith('/I')):
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index ffb6149..c6eadd7 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -886,7 +886,7 @@ $envvarstr
 		if ($? == -1) {
 			die("Unable to run $cmd: $!");
 		} elsif ($? & 127) {
-			die(snprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127),  ($? & 128) ? 'with' : 'without'));
+			die(sprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127),  ($? & 128) ? 'with' : 'without'));
 		}
 
 		my $exitcode = $? >> 8;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list