diff options
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 2 | ||||
| -rw-r--r-- | lib/tdb/wscript | 2 | ||||
| -rwxr-xr-x | script/autobuild.py | 2 | ||||
| -rwxr-xr-x | script/land.py | 2 | ||||
| -rwxr-xr-x | source4/lib/ldb/wscript | 2 | ||||
| -rwxr-xr-x | source4/scripting/bin/samba_dnsupdate | 8 | ||||
| -rwxr-xr-x | source4/scripting/bin/samba_spnupdate | 4 | ||||
| -rw-r--r-- | wintest/wintest.py | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 8c42966057..ebe8fba1f7 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -37,7 +37,7 @@ if os.environ.get('WAF_NOTHREADS') == '1': LIB_PATH="shared" -os.putenv('PYTHONUNBUFFERED', '1') +os.environ['PYTHONUNBUFFERED'] = '1' if Constants.HEXVERSION < 0x105019: diff --git a/lib/tdb/wscript b/lib/tdb/wscript index d20c93893c..f704bc79aa 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -119,7 +119,7 @@ def test(ctx): test_prefix = "%s/st" % (Utils.g_module.blddir) shutil.rmtree(test_prefix, ignore_errors=True) os.makedirs(test_prefix) - os.putenv('TEST_DATA_PREFIX', test_prefix) + os.environ['TEST_DATA_PREFIX'] = test_prefix cmd = os.path.join(Utils.g_module.blddir, 'tdbtorture') ret = samba_utils.RUN_COMMAND(cmd) print("testsuite returned %d" % ret) diff --git a/script/autobuild.py b/script/autobuild.py index b02928574a..c6e965e69e 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -14,7 +14,7 @@ samba_master_ssh = os.getenv('SAMBA_MASTER_SSH', 'git+ssh://git.samba.org/data/g cleanup_list = [] -os.putenv('CC', "ccache gcc") +os.environ['CC'] = "ccache gcc" builddirs = { "samba3" : "source3", diff --git a/script/land.py b/script/land.py index 4b7d1cacba..f8ae7b4493 100755 --- a/script/land.py +++ b/script/land.py @@ -26,7 +26,7 @@ samba_master_ssh = os.getenv('SAMBA_MASTER_SSH', 'git+ssh://git.samba.org/data/g cleanup_list = [] -os.putenv('CC', "ccache gcc") +os.environ['CC'] = "ccache gcc" tasks = { "source3" : [ ("autogen", "./autogen.sh", "text/plain"), diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index a0b92d57d6..f31f3dd29d 100755 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -252,7 +252,7 @@ def test(ctx): test_prefix = "%s/st" % (Utils.g_module.blddir) shutil.rmtree(test_prefix, ignore_errors=True) os.makedirs(test_prefix) - os.putenv('TEST_DATA_PREFIX', test_prefix) + os.environ['TEST_DATA_PREFIX'] = test_prefix cmd = 'tests/test-tdb.sh' ret = samba_utils.RUN_COMMAND(cmd) print("testsuite returned %d" % ret) diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate index cacdc36194..99f898e204 100755 --- a/source4/scripting/bin/samba_dnsupdate +++ b/source4/scripting/bin/samba_dnsupdate @@ -26,13 +26,13 @@ import subprocess # ensure we get messages out immediately, so they get in the samba logs, # and don't get swallowed by a timeout -os.putenv('PYTHONUNBUFFERED', '1') +os.environ['PYTHONUNBUFFERED'] = '1' # forcing GMT avoids a problem in some timezones with kerberos. Both MIT # heimdal can get mutual authentication errors due to the 24 second difference # between UTC and GMT when using some zone files (eg. the PDT zone from # the US) -os.putenv("TZ", "GMT") +os.environ["TZ"] = "GMT" # Find right directory when running from source tree sys.path.insert(0, "bin/python") @@ -259,7 +259,7 @@ def call_nsupdate(d): f.write("send\n") f.close() - os.putenv("KRB5CCNAME", ccachename) + os.environ["KRB5CCNAME"] = ccachename try: cmd = nsupdate_cmd[:] cmd.append(tmpfile) @@ -359,7 +359,7 @@ else: # use our private krb5.conf to avoid problems with the wrong domain # bind9 nsupdate wants the default domain set krb5conf = lp.private_path('krb5.conf') -os.putenv('KRB5_CONFIG', krb5conf) +os.environ['KRB5_CONFIG'] = krb5conf file = open(dns_update_list, "r") diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate index 0dcc9fecfe..169c12ab00 100755 --- a/source4/scripting/bin/samba_spnupdate +++ b/source4/scripting/bin/samba_spnupdate @@ -22,13 +22,13 @@ import os, sys # ensure we get messages out immediately, so they get in the samba logs, # and don't get swallowed by a timeout -os.putenv('PYTHONUNBUFFERED', '1') +os.environ['PYTHONUNBUFFERED'] = '1' # forcing GMT avoids a problem in some timezones with kerberos. Both MIT # heimdal can get mutual authentication errors due to the 24 second difference # between UTC and GMT when using some zone files (eg. the PDT zone from # the US) -os.putenv("TZ", "GMT") +os.environ["TZ"] = "GMT" # Find right directory when running from source tree sys.path.insert(0, "bin/python") diff --git a/wintest/wintest.py b/wintest/wintest.py index 189d251ada..d10d0ad2ff 100644 --- a/wintest/wintest.py +++ b/wintest/wintest.py @@ -13,7 +13,7 @@ class wintest(): self.vars = {} self.list_mode = False self.vms = None - os.putenv('PYTHONUNBUFFERED', '1') + os.environ['PYTHONUNBUFFERED'] = '1' self.parser = optparse.OptionParser("wintest") def check_prerequesites(self): @@ -142,7 +142,7 @@ class wintest(): def putenv(self, key, value): '''putenv with substitution''' - os.putenv(key, self.substitute(value)) + os.environ[key] = self.substitute(value) def chdir(self, dir): '''chdir with substitution''' |