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:
25b9760
)
s4-s3-upgrade Do not use python 2.6 style exceptions
author
Andrew Bartlett
<abartlet@samba.org>
Fri, 9 Sep 2011 02:44:56 +0000
(12:44 +1000)
committer
Andrew Bartlett
<abartlet@samba.org>
Fri, 9 Sep 2011 06:54:16 +0000
(08:54 +0200)
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Sep 9 08:54:16 CEST 2011 on sn-devel-104
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 8157b457ebd0ecb7ecec852afceb9b66a346362e..41c93ea151fb632e79efcbd9b37f37fa0a1a2b7c 100644
(file)
--- a/
source4/scripting/python/samba/upgrade.py
+++ b/
source4/scripting/python/samba/upgrade.py
@@
-132,8
+132,8
@@
def import_idmap(idmapdb, samba3, logger):
try:
samba3_idmap = samba3.get_idmap_db()
- except IOError
as (errno, strerror)
:
- logger.warn('Cannot open idmap database, Ignoring:
({0}): {1}'.format(errno, strerror
))
+ except IOError
, e
:
+ logger.warn('Cannot open idmap database, Ignoring:
%s', str(e
))
return
currentxid = max(samba3_idmap.get_user_hwm(), samba3_idmap.get_group_hwm())