From 1255383140a9b3fbd957c1f7ce47e89c17cc4eda Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 10 Oct 2011 13:09:30 +1100
Subject: 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
---
 source4/scripting/python/samba/upgrade.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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':
-- 
cgit