summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-10-10 13:09:30 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-10-11 13:41:36 +1100
commit1255383140a9b3fbd957c1f7ce47e89c17cc4eda (patch)
tree6445c4da78f35ea383b7b2bb71c4211b2cbcbef3 /source4
parentc9bb497f3f7fae8aa6ec4a4a45a2ac4047b640a5 (diff)
downloadsamba-1255383140a9b3fbd957c1f7ce47e89c17cc4eda.tar.gz
samba-1255383140a9b3fbd957c1f7ce47e89c17cc4eda.tar.bz2
samba-1255383140a9b3fbd957c1f7ce47e89c17cc4eda.zip
s4-s3-upgrade: Allow import (just without a uid mapping) where getpwnam fails
This allows the tests to pass on systems without a jelmer user :-) Andrew Bartlett
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 60cff51198..53ae93afcf 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -591,7 +591,7 @@ Please fix this account before attempting to upgrade again
except passdb.error:
try:
uids[username] = pwd.getpwnam(username).pw_uid
- except passdb.error:
+ except KeyError:
pass
if not admin_user and username.lower() == 'root':