diff options
| author | Radek Vykydal <rvykydal@redhat.com> | 2008-08-01 09:32:51 +0200 |
|---|---|---|
| committer | Radek Vykydal <rvykydal@redhat.com> | 2008-08-01 09:32:51 +0200 |
| commit | daeed6c8feafbfb717325cc42b85b089a44fa9d4 (patch) | |
| tree | a11c103a1711792bb141b5d0b6c49fbd72b8b319 /timezone.py | |
| parent | c247210a4b12000255271a2038093616f1810773 (diff) | |
| download | anaconda-daeed6c8feafbfb717325cc42b85b089a44fa9d4.tar.gz anaconda-daeed6c8feafbfb717325cc42b85b089a44fa9d4.tar.xz anaconda-daeed6c8feafbfb717325cc42b85b089a44fa9d4.zip | |
Handling (ask user) of invalid timezone value in kickstart added (#404321)
Diffstat (limited to 'timezone.py')
| -rw-r--r-- | timezone.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/timezone.py b/timezone.py index 3960d819d..bb599bb57 100644 --- a/timezone.py +++ b/timezone.py @@ -19,6 +19,7 @@ import shutil import iutil +import os from flags import flags import logging @@ -43,10 +44,13 @@ class Timezone: fromFile = instPath + "/usr/share/zoneinfo/" + self.tz - try: - shutil.copyfile(fromFile, instPath + "/etc/localtime") - except OSError, (errno, msg): - log.error("Error copying timezone (from %s): %s" % (fromFile, msg)) + if not os.access(fromFile, os.R_OK): + log.error("Timezone to be copied (%s) doesn't exist" % fromFile) + else: + try: + shutil.copyfile(fromFile, instPath + "/etc/localtime") + except OSError, (errno, msg): + log.error("Error copying timezone (from %s): %s" % (fromFile, msg)) f = open(instPath + "/etc/sysconfig/clock", "w") |