SOURCES: anaconda-timezone.patch - learning python

glen glen at pld-linux.org
Thu Sep 28 19:30:01 CEST 2006


Author: glen                         Date: Thu Sep 28 17:30:01 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- learning python

---- Files affected:
SOURCES:
   anaconda-timezone.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/anaconda-timezone.patch
diff -u SOURCES/anaconda-timezone.patch:1.2 SOURCES/anaconda-timezone.patch:1.3
--- SOURCES/anaconda-timezone.patch:1.2	Thu Sep 28 01:06:58 2006
+++ SOURCES/anaconda-timezone.patch	Thu Sep 28 19:29:56 2006
@@ -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()
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/anaconda-timezone.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list