Attachment 11335 Details for Bug 11436 – 4.3 patch cherry-picked from master

[patch] 4.3 patch cherry-picked from master

0001-python-samba-upgrade.py-Fix-format-string-syntax-in-.patch (text/plain), 1.43 KB, created by Andrew Bartlett on 2015-08-14 20:12:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2015-08-14 20:12:07 UTC

Size: 1.43 KB

patch

obsolete

>From 1b7b30428cab11f50170af246534e2e00561d7da Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Fri, 14 Aug 2015 16:43:41 +1200
>Subject: [PATCH] python:samba/upgrade.py Fix format string syntax in error
> condition
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11436
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>
>Autobuild-User(master): Martin Schwenke <martins@samba.org>
>Autobuild-Date(master): Fri Aug 14 10:52:39 CEST 2015 on sn-devel-104
>
>(cherry picked from commit a431828460a8b069589662ad87e47c61c020eb9c)
>---
> python/samba/upgrade.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
>index 94b7732..215ccd3 100644
>--- a/python/samba/upgrade.py
>+++ b/python/samba/upgrade.py
>@@ -407,7 +407,7 @@ def get_posix_attr_from_ldap_backend(logger, ldb_object, base_dn, user, attr):
>                         expression=("(&(objectClass=posixAccount)(uid=%s))"
>                         % (user)), attrs=[attr])
>     except ldb.LdbError, e:
>-        raise ProvisioningError("Failed to retrieve attribute %s for user %s, the error is: %s", attr, user, e)
>+        raise ProvisioningError("Failed to retrieve attribute %s for user %s, the error is: %s" % (attr, user, e))
>     else:
>         if msg.count <= 1:
>             # This will raise KeyError (which is what we want) if there isn't a entry for this user
>-- 
>2.4.3
>

Flags:

metze: review+

Actions: View

Attachments on bug 11436: 11331 | 11332 | 11335