SOURCES: LightYears-config_path.patch - up for 1.2a by Micha³ Liso...

[shadzik]

Author: shadzik                      Date: Sun Sep 24 09:57:58 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 1.2a by Michał Lisowski <lisu87 at gmail dot com>

---- Files affected:
SOURCES:
   LightYears-config_path.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/LightYears-config_path.patch
diff -u SOURCES/LightYears-config_path.patch:1.1 SOURCES/LightYears-config_path.patch:1.2
--- SOURCES/LightYears-config_path.patch:1.1	Thu Apr 20 22:39:15 2006
+++ SOURCES/LightYears-config_path.patch	Sun Sep 24 11:57:53 2006
@@ -1,33 +1,30 @@
-diff -dur -x '*~' LightYears.orig/code/config.py LightYears/code/config.py
---- LightYears.orig/code/config.py	2006-03-31 21:11:15.000000000 +0200
-+++ LightYears/code/config.py	2006-04-20 22:35:11.000000000 +0200
-@@ -4,6 +4,7 @@
- # 
- 
- import pickle , startup
-+import os
- 
- 
- class Config:
-@@ -17,13 +18,15 @@
+--- LightYears.orig/code/config.py	2006-09-23 19:09:59.000000000 +0200
++++ LightYears/code/config.py	2006-09-23 19:10:17.000000000 +0200
+@@ -17,10 +17,12 @@
  
  cfg = Config()
  
 +DIR = "~/.LightYears"
- FILENAME = "config.dat"
+ FILENAME = None
  
  def Initialise():
 -    global cfg, FILENAME
 +    global cfg, DIR, FILENAME
++
+ 
+     home = extra.Get_Home()
+     if ( home == None ):
+@@ -29,7 +31,8 @@
+         FILENAME = os.path.join(home, ".20k.cfg")
  
      try:
 -        f = file(FILENAME, "rb")
-+        dir = os.path.expanduser(DIR)
-+        f = file(os.path.join(dir, FILENAME), "rb")
++	dir = os.path.expanduser(DIR)
++	f = file(os.path.join(dir, FILENAME), "rb")
          cfg2 = pickle.load(f)
          f.close()
          if ( cfg2.version == startup.Get_Game_Version() ):
-@@ -36,7 +39,10 @@
+@@ -42,7 +45,10 @@
      global cfg, FILENAME
  
      try:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/LightYears-config_path.patch?r1=1.1&r2=1.2&f=u