summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-02 13:08:37 -0700
committerAndrew Tridgell <tridge@samba.org>2010-10-02 21:11:52 -0700
commit762ad1c4baf04aa2e5dcdbcf6242b3e34d92cd4e (patch)
treea1b6c6f3cf7a418e73bcf0f7bff29b4a85cf6152
parente36f20d39dae2f20ebfcf8be156963e10e150066 (diff)
downloadsamba-762ad1c4baf04aa2e5dcdbcf6242b3e34d92cd4e.tar.gz
samba-762ad1c4baf04aa2e5dcdbcf6242b3e34d92cd4e.tar.bz2
samba-762ad1c4baf04aa2e5dcdbcf6242b3e34d92cd4e.zip
s4-test: silence the Failed to chown message in make test
-rw-r--r--source4/scripting/python/samba/provision.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 1d0abf426a..79f180dfcb 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1672,8 +1672,9 @@ def provision(setup_dir, logger, session_info,
os.chmod(dns_keytab_path, 0640)
os.chown(dns_keytab_path, -1, paths.bind_gid)
except OSError:
- logger.info("Failed to chown %s to bind gid %u", dns_keytab_path,
- paths.bind_gid)
+ if os.environ.get('UID_WRAPPER'):
+ logger.info("Failed to chown %s to bind gid %u", dns_keytab_path,
+ paths.bind_gid)
logger.info("Please install the phpLDAPadmin configuration located at %s into /etc/phpldapadmin/config.php",
@@ -1826,7 +1827,8 @@ def create_zone_file(lp, logger, paths, targetdir, setup_path, dnsdomain,
os.chmod(dns_dir, 0775)
os.chmod(paths.dns, 0664)
except OSError:
- logger.error("Failed to chown %s to bind gid %u" % (dns_dir, paths.bind_gid))
+ if os.environ.get('UID_WRAPPER'):
+ logger.error("Failed to chown %s to bind gid %u" % (dns_dir, paths.bind_gid))
if targetdir is None:
os.system(rndc + " unfreeze " + lp.get("realm"))