- learning python

Changed files:
    anaconda-timezone.patch -> 1.3

diff --git a/anaconda-timezone.patch b/anaconda-timezone.patch
index 86f24cd2818c02c5e1229e661be92ccb311fcea2..932697ef630bf3c3be12d99e7ae1c4a2586719b7 100644 (file)
--- a/anaconda-timezone.patch
+++ b/anaconda-timezone.patch
@@ -36,19 +36,28 @@
                  #In case the /etc/sysconfig/clock is messed up, use New York as default
                  self.fallbackEntry = entry
  
---- anaconda-11.0.5/timezone.py~       2005-08-12 20:02:54.000000000 +0300
-+++ anaconda-11.0.5/timezone.py        2006-09-26 20:37:15.448072953 +0300
-@@ -42,11 +42,31 @@
+--- anaconda-11.0.5/timezone.py        2006-09-26 20:37:15.448072953 +0300
++++ anaconda-11.0.5/timezone.py        2006-09-28 14:46:04.567338250 +0300
+@@ -17,6 +17,8 @@
+ import logging
+ log = logging.getLogger("anaconda")
+ 
++import string
++
+ def bool(val):
+     if val: return "true"
+     return "false"
+@@ -42,11 +44,31 @@
            log.error("Error copying timezone (from %s): %s" % (fromFile, msg))
  
        f = open(instPath + "/etc/sysconfig/clock", "w")
 -
 -      f.write('ZONE="%s"\n' % self.tz)
-+      f.write('# Should the hardware clock be kept in Coordinated Universal Time (instead of local time).')
++      f.write('# Should the hardware clock be kept in Coordinated Universal Time (instead of local time).\n')
        f.write("UTC=%s\n" % bool(self.utc))
-+      f.write('# true means  your  machine  uses epoch 1980 in its hardware clock')
++      f.write('# true means your machine uses epoch 1980 in its hardware clock\n')
        f.write("ARC=%s\n" % bool(self.arc))
-+      f.write('# true means your machine uses  epoch  1900 in its hardware clock')
++      f.write('# true means your machine uses epoch 1900 in its hardware clock\n')
 +      f.write("SRM=false\n")
 +      f.close()
 +
@@ -56,17 +65,17 @@
 +      (area, zone) = string.split(self.tz, "/")
  
 +      f = open(instPath + "/etc/sysconfig/timezone", "w")
-+      f.write('# Time zone information.')
-+      f.write('# Directory containing zone information files.')
-+      f.write('ZONE_INFO_DIR="/usr/share/zoneinfo"')
++      f.write('# Time zone information.\n')
++      f.write('# Directory containing zone information files.\n')
++      f.write('ZONE_INFO_DIR="/usr/share/zoneinfo"\n')
 +      f.write("\n");
-+      f.write('# Scheme you would like to use in your system.')
-+      f.write('ZONE_INFO_SCHEME="posix"')
++      f.write('# Scheme you would like to use in your system.\n')
++      f.write('ZONE_INFO_SCHEME="posix"\n')
 +      f.write("\n")
-+      f.write('# Area (sometimes may be empty)')
++      f.write('# Area (sometimes may be empty)\n')
 +      f.write('ZONE_INFO_AREA="%s"\n' % area)
 +      f.write("\n")
-+      f.write('# Name of the time zone for your system.')
++      f.write('# Name of the time zone for your system.\n')
 +      f.write('TIME_ZONE="%s"\n' % zone)
 +      f.write("\n");
        f.close()