[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  17fe5e0 s4-samba_dnsupate Fix syntax error
      from  e78d465 Revert "s3-test: disable ktest for now"

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


- Log -----------------------------------------------------------------
commit 17fe5e0ca4fb46ffe344aa93e97d948ec82acf37
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 7 16:02:44 2011 +1000

    s4-samba_dnsupate Fix syntax error
    
    This particular sub-part of the script isn't tested in 'make test' due
    to it making real changes to DNS.
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Thu Apr  7 08:51:11 CEST 2011 on sn-devel-104

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

Summary of changes:
 source4/scripting/bin/samba_dnsupdate |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index 695bed6..e86fba2 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -259,20 +259,19 @@ def call_nsupdate(d):
     f.write("send\n")
     f.close()
 
+    global error_count
     os.environ["KRB5CCNAME"] = ccachename
     try:
         cmd = nsupdate_cmd[:]
         cmd.append(tmpfile)
         ret = subprocess.call(cmd, shell=False)
         if ret != 0:
-            global error_count
             if opts.fail_immediately:
                 sys.exit(1)
             error_count = error_count + 1
             if opts.verbose:
                 print("Failed nsupdate: %d" % ret)
     except Exception, estr:
-        global error_count
         if opts.fail_immediately:
             sys.exit(1)
         error_count = error_count + 1


-- 
Samba Shared Repository