diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2013-07-24 22:12:33 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@gmail.com> | 2013-07-24 22:12:33 -0700 |
| commit | 696bcc1f0acc67646872cd6ce1b90375ca0ae068 (patch) | |
| tree | a930058df6a51076e7527dadaac099c42ac0d2f6 /cloudinit/distros/debian.py | |
| parent | 8f3bfd9db16bfc6cd2acfb068b9ffe14ea1570d3 (diff) | |
| download | vyos-cloud-init-696bcc1f0acc67646872cd6ce1b90375ca0ae068.tar.gz vyos-cloud-init-696bcc1f0acc67646872cd6ce1b90375ca0ae068.zip | |
Remove duplicate timezone file finding and error raising.
Diffstat (limited to 'cloudinit/distros/debian.py')
| -rw-r--r-- | cloudinit/distros/debian.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index 0811eefd..8fe49cbe 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -44,7 +44,6 @@ class Distro(distros.Distro): network_conf_fn = "/etc/network/interfaces" tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" - tz_zone_dir = "/usr/share/zoneinfo" def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) @@ -130,12 +129,7 @@ class Distro(distros.Distro): return "127.0.1.1" def set_timezone(self, tz): - # TODO(harlowja): move this code into - # the parent distro... - tz_file = os.path.join(self.tz_zone_dir, str(tz)) - if not os.path.isfile(tz_file): - raise RuntimeError(("Invalid timezone %s," - " no file found at %s") % (tz, tz_file)) + tz_file = self._find_tz_file(tz) # Note: "" provides trailing newline during join tz_lines = [ util.make_header(), |