git.samba.org
/
nivanova
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c9bb497
)
s4-s3-upgrade: Allow import (just without a uid mapping) where getpwnam fails
author
Andrew Bartlett
<abartlet@samba.org>
Mon, 10 Oct 2011 02:09:30 +0000
(13:09 +1100)
committer
Andrew Bartlett
<abartlet@samba.org>
Tue, 11 Oct 2011 02:41:36 +0000
(13:41 +1100)
This allows the tests to pass on systems without a jelmer user :-)
Andrew Bartlett
source4/scripting/python/samba/upgrade.py
patch
|
blob
|
history
diff --git
a/source4/scripting/python/samba/upgrade.py
b/source4/scripting/python/samba/upgrade.py
index 60cff51198453cd93047974e1c2004dcb420e601..53ae93afcfa7ed723078c8a3ef007953c661d6c1 100644
(file)
--- 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.e
rror:
+ except
KeyE
rror:
pass
if not admin_user and username.lower() == 'root':