[PATCH 2/2] Use ksdata.timezone and timezone module instead of anaconda.timezone

Chris Lumens clumens at redhat.com
Wed Aug 22 15:27:53 UTC 2012


> diff --git a/pyanaconda/packages.py b/pyanaconda/packages.py
> index 334ee4a..360451a 100644
> --- a/pyanaconda/packages.py
> +++ b/pyanaconda/packages.py
> @@ -44,8 +44,8 @@ def setupTimezone(anaconda):
>      if anaconda.upgrade or flags.imageInstall or anaconda.dir == DISPATCH_BACK:
>          return
>  
> -    os.environ["TZ"] = anaconda.timezone.tz
> -    tzfile = "/usr/share/zoneinfo/" + anaconda.timezone.tz
> +    os.environ["TZ"] = anaconda.ksdata.timezone.timezone
> +    tzfile = "/usr/share/zoneinfo/" + anaconda.ksdata.timezone.timezone
>      tzlocalfile = "/etc/localtime"
>      if not os.access(tzfile, os.R_OK):
>          log.error("unable to set timezone")
> @@ -62,7 +62,7 @@ def setupTimezone(anaconda):
>      if iutil.isS390():
>          return
>      args = [ "--hctosys" ]
> -    if anaconda.timezone.utc:
> +    if anaconda.ksdata.timezone.isUtc:
>          args.append("-u")
>  
>      try:

This function doesn't get called from anywhere now, so if this stuff is
important, you'll need to take extra steps.

- Chris


More information about the anaconda-patches mailing list