NOTE: I reverted this, and tried an update on rawhide and the problem appears
to have 'gone away'. I'm not sure why. I checked to makes sure the update was
applied (debug=1 and hit debug on the TZ dalog). It now remembers UTC across
prev/next just fine. Someone else must have fixed it some other way.
This reverts commit 0317f7cb17aed20bbbf7918488e9d7b2858aa0b2.
---
pyanaconda/__init__.py | 9 +--------
pyanaconda/iw/timezone_gui.py | 4 ++++
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/pyanaconda/__init__.py b/pyanaconda/__init__.py
index 36439e6..f773933 100644
--- a/pyanaconda/__init__.py
+++ b/pyanaconda/__init__.py
@@ -193,15 +193,8 @@ class Anaconda(object):
def timezone(self):
if not self._timezone:
import timezone
- from bootloader import hasWindows
-
self._timezone = timezone.Timezone()
- tz = self.instLanguage.getDefaultTimeZone(self.rootPath)
- if not self.ksdata:
- utc = not hasWindows(self.bootloader)
- else:
- utc = 0
- self._timezone.setTimezoneInfo(tz, utc)
+ self._timezone.setTimezoneInfo(self.instLanguage.getDefaultTimeZone(self.rootPath))
return self._timezone
diff --git a/pyanaconda/iw/timezone_gui.py b/pyanaconda/iw/timezone_gui.py
index ef37c94..1ca4829 100644
--- a/pyanaconda/iw/timezone_gui.py
+++ b/pyanaconda/iw/timezone_gui.py
@@ -30,6 +30,7 @@ import sys
from timezone_map_gui import TimezoneMap, Enum
from iw_gui import *
from booty.bootloaderInfo import dosFilesystems
+from bootloader import hasWindows
from constants import *
import gettext
@@ -103,6 +104,9 @@ class TimezoneWindow(InstallWindow):
self.tz.setCurrent(self.zonetab.findEntryByTZ(self.default))
self.utcCheckbox.set_active(asUTC)
+ if not anaconda.ksdata:
+ self.utcCheckbox.set_active(not hasWindows(anaconda.bootloader))
+
self.notebook.remove(self.vbox)
return self.vbox
--
1.7.0.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
