diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-09-27 09:30:47 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-09-27 18:45:12 +0200 |
| commit | 2a797f29aa12f6847844af504026be52db659fbb (patch) | |
| tree | 8d3e4a6e2003239c5b69efd578c9452e0bc9b86d /source4/scripting/python/samba/upgrade.py | |
| parent | 6986f7bdda56d693c642945485006f9660053758 (diff) | |
| download | samba-2a797f29aa12f6847844af504026be52db659fbb.tar.gz samba-2a797f29aa12f6847844af504026be52db659fbb.tar.xz samba-2a797f29aa12f6847844af504026be52db659fbb.zip | |
s4-python: Various formatting fixes.
* Trailing whitespace
* use of "==" where "is" should be used
* double spaces
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 05d0dd6d88..194983c02a 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -883,9 +883,9 @@ Please fix this account before attempting to upgrade again s4_passdb.add_sam_account(userdata[username]) if username in uids: add_ad_posix_idmap_entry(result.samdb, userdata[username].user_sid, uids[username], "ID_TYPE_UID", logger) - if (username in homes) and (homes[username] != None) and \ - (username in shells) and (shells[username] != None) and \ - (username in pgids) and (pgids[username] != None): + if (username in homes) and (homes[username] is not None) and \ + (username in shells) and (shells[username] is not None) and \ + (username in pgids) and (pgids[username] is not None): add_posix_attrs(samdb=result.samdb, sid=userdata[username].user_sid, name=username, nisdomain=domainname.lower(), xid_type="ID_TYPE_UID", home=homes[username], shell=shells[username], pgid=pgids[username], logger=logger) logger.info("Adding users to groups") |