Changeset 4433

Timestamp:

04/04/09 22:39:48 (4 years ago)

Author:

gpolo

Message:

Changed merge_ini.merge signature to match sqlitedb.merge

Files:

• trunk/umit/merger/merge_ini.py (modified) (2 diffs)

trunk/umit/merger/merge_ini.py

@@ -3 +3 @@
 import ConfigParser
 
-def merge(old_file, new_file):
+def merge(from_file, to_file):
     """
-    @old_file: Path to a supposed older ini file
-    @new_file: Path to a supposed newer ini file
+    @from_file: Path to a supposed newer ini file
+    @to_file: Path to a supposed older ini file
     @return true or false
     """
-    if not os.path.exists(old_file) or not os.path.exists(new_file):
+    if not os.path.exists(from_file) or not os.path.exists(to_file):
         return False
 
-    # Backup old file
-    shutil.copyfile(old_file, old_file + '.bak')
+    # Backup the destination
+    shutil.copyfile(to_file, to_file + '.bak')
 
     # Read new file
     config_new = ConfigParser.RawConfigParser()
-    config_new.read(new_file)
+    config_new.read(from_file)
 
     # Read old file
     config = ConfigParser.RawConfigParser()
-    config.read(old_file)
+    config.read(to_file)
 
     # Merge files
@@ -36 +36 @@
 
     # Write back the merged configuration
-    f = open(old_file, 'wb')
+    f = open(to_file, 'wb')
     config.write(f)