[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

Hi Tridge,

On Mon, 2010-11-29 at 08:50 +0100, Andrew Tridgell wrote:
> The branch, master has been updated
>        via  7025087 wintest: cope with the heimdal version of kinit
>        via  dc0c89c s4-samdb: give a better exception if multiple users match in password change
>        via  c522cd7 s4-repl_schema: fixed ldb exception handling
>        via  37bfc4e s4-samba-tool: fixed exception handling in subcommands
>        via  6250690 s4-samba-tool: fixed ldb exception handling in domainlevel command
>        via  a1f9692 s4-samba-tool: improved exception handling in samba-tool
>        via  8c59bbd s4-join: fixed exception handling in join command
>        via  abe9ac5 s4-ldapcmp: make ldapcmp a samba-tool command
>        via  f8d73e4 s4-ldapcmp: fixed exception handling
>        via  0dd2152 s4-pyglue: added get_debug_level() method
>        via  33d1787 s4-loadparm: use loadparm_init_global() instead of loadparm_init()
>        via  b20ce43 s4-loadparm: added loadparm_init_global()
>        via  6982a00 s4-gpo: started on samba-tool gpo list command
>        via  6cd01c9 s4-dsdb: give full error message for operational failures
>        via  74d373d s4-pydsdb: two more GPO related flags
>        via  7a826d0 s4-samba-tool: started on gpo subcommands in python
>        via  e54c8be s4-pydsdb: added GPO policy flags
>       from  97f0d6c samba.tests.hostconfig: Fix import.

                     name="msDS-SupportedEncryptionTypes")
                 samdb.modify(msg)
-            except ldb.LdbError, (ldb.ERR_NO_SUCH_ATTRIBUTE, _):
-                # It might be that this attribute does not exist in ...
-                pass
+            except ldb.LdbError, (enum, estr):
+                if enum == ldb.ERR_NO_SUCH_ATTRIBUTE:
+                    # It might be that this attribute does not exist in
this schema
+                    pass
+                raise
pass is a noop in Python, so checking the value of enum doesn't change
the behaviour of this code in any way. If there's no need to handle this
error, perhaps we can just get rid of this try/except completely?

Cheers,

Jelmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20101130/efa4226f/attachment.pgp>