26 lines
1.0 KiB
Diff
26 lines
1.0 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Jim Fehlig <jfehlig@novell.com>
|
||
|
|
# Date 1274822804 21600
|
||
|
|
# Node ID a83e97657ba0f3ea232fe0dfb9edccf8e28aa982
|
||
|
|
# Parent 14d040342c6618365750b2c3b96ca01ff4a5e5dd
|
||
|
|
tools: Fix time offset when localtime=0
|
||
|
|
|
||
|
|
localtime can be stored in vm config as a string, resulting in
|
||
|
|
incorrect calculation of rtc_timeoffset. Cast localtime to int
|
||
|
|
to ensure rtc_timeoffset is calculated properly.
|
||
|
|
|
||
|
|
Signed-off-by: Jim Fehlig <jfehlig@novell.com>
|
||
|
|
|
||
|
|
diff -r 14d040342c66 -r a83e97657ba0 tools/python/xen/xend/image.py
|
||
|
|
--- a/tools/python/xen/xend/image.py Tue May 25 11:13:22 2010 -0600
|
||
|
|
+++ b/tools/python/xen/xend/image.py Tue May 25 15:26:44 2010 -0600
|
||
|
|
@@ -129,7 +129,7 @@
|
||
|
|
self.dmargs = self.parseDeviceModelArgs(vmConfig)
|
||
|
|
self.pid = None
|
||
|
|
rtc_timeoffset = int(vmConfig['platform'].get('rtc_timeoffset', 0))
|
||
|
|
- if vmConfig['platform'].get('localtime', 0):
|
||
|
|
+ if int(vmConfig['platform'].get('localtime', 0)):
|
||
|
|
if time.localtime(time.time())[8]:
|
||
|
|
rtc_timeoffset -= time.altzone
|
||
|
|
else:
|