]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4/scripting/samba_upgradedns: avoid .has_key()
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Sat, 27 Oct 2018 22:17:07 +0000 (11:17 +1300)
committerDouglas Bagnall <dbagnall@samba.org>
Thu, 1 Nov 2018 04:08:10 +0000 (05:08 +0100)
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <noel.power@suse.com>
source4/scripting/bin/samba_upgradedns

index 6eb7f823a50b68039dbb53e2c9fd75096e9bfb9c..bfd22c81f29188a6af715e59391663e656ca4e0f 100755 (executable)
@@ -516,14 +516,14 @@ if __name__ == '__main__':
                     os.chmod(paths.binddns_dir, 0o770)
                     os.chown(paths.binddns_dir, -1, paths.bind_gid)
                 except OSError:
-                    if not os.environ.has_key('SAMBA_SELFTEST'):
+                    if 'SAMBA_SELFTEST' not in os.environ:
                         logger.info("Failed to chown %s to bind gid %u",
                                     paths.binddns_dir, paths.bind_gid)
                 try:
                     os.chmod(bind_dns_keytab_path, 0o640)
                     os.chown(bind_dns_keytab_path, -1, paths.bind_gid)
                 except OSError:
-                    if not os.environ.has_key('SAMBA_SELFTEST'):
+                    if 'SAMBA_SELFTEST' not in os.environ:
                         logger.info("Failed to chown %s to bind gid %u",
                                     bind_dns_keytab_path, paths.bind_gid)