Attachment 7079 Details for Bug 39069

[patch] LC_TIME.patch

LC_TIME.patch (text/plain), 1.24 KB, created by Arvid Requate on 2015-08-03 15:12 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2015-08-03 15:12 CEST

Size: 1.24 KB

patch

obsolete

>Index: umc/python/adtakeover/takeover.py
>===================================================================
>--- umc/python/adtakeover/takeover.py	(Revision 60906)
>+++ umc/python/adtakeover/takeover.py	(Arbeitskopie)
>@@ -62,6 +62,7 @@
> import univention.lib
> import univention.lib.s4
> from datetime import datetime, timedelta
>+import locale
> import univention.config_registry
> # from samba.netcmd.common import netcmd_get_domain_infos_via_cldap
> from samba.dcerpc import nbt
>@@ -801,10 +802,15 @@
> 			return False
> 
> 		TIME_FORMAT = "%a %b %d %H:%M:%S %Z %Y"
>+		time_string = stdout.strip()
>+		old_locale = locale.getlocale(locale.LC_TIME)
> 		try:
>-			remote_datetime = datetime.strptime(stdout.strip(), TIME_FORMAT)
>+			locale.setlocale(locale.LC_TIME, (None, None)) # 'C' as env['LC_ALL'] some lines earlier
>+			remote_datetime = datetime.strptime(time_string, TIME_FORMAT)
> 		except ValueError as ex:
>-			raise TimeSynchronizationFailed(_("AD Server did not return proper time string: %s.") % (stdout.strip(),))
>+			raise TimeSynchronizationFailed(_("AD Server did not return proper time string: %s.") % (time_string,))
>+		finally:
>+			locale.setlocale(locale.LC_TIME, old_locale)
> 
> 		local_datetime = datetime.today()
> 		delta_t = local_datetime - remote_datetime

Actions: View | Diff

Attachments on bug 39069: 7079