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

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.error:
+            except KeyError:
                 pass
 
         if not admin_user and username.lower() == 'root':