backport:Improved timezone installation error message.
authorZhang Qiang <qiang.z.zhang@intel.com>
Wed, 26 Oct 2011 03:21:59 +0000 (11:21 +0800)
committerZhang Qiang <qiang.z.zhang@intel.com>
Wed, 26 Oct 2011 03:21:59 +0000 (11:21 +0800)
backport from mic2 commit:
8507e7919abc1271ca77375deeec2071989fa13c

mic/kickstart/__init__.py

index 3626d02..dcc708e 100644 (file)
@@ -172,11 +172,12 @@ class TimezoneConfig(KickstartConfig):
         f.write("ZONE=\"" + tz + "\"\n")
         f.write("UTC=" + utc + "\n")
         f.close()
+        tz_source = self.path("/usr/share/zoneinfo/%s" % (tz))
+        tz_dest = self.path("/etc/localtime")
         try:
-            shutil.copyfile(self.path("/usr/share/zoneinfo/%s" %(tz,)),
-                            self.path("/etc/localtime"))
+            shutil.copyfile(tz_source, tz_dest)
         except (IOError, OSError), (errno, msg):
-            raise errors.KsError("Error copying timezone info: %s" %(msg,))
+            raise errors.KickstartError("Error copying timezone info from '%s' to '%s': %s" %(tz_source, tz_dest, msg))
 
 
 class AuthConfig(KickstartConfig):