Changeset 16198e3 in nscp

Timestamp:

11/14/11 23:56:33 (18 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

96c1461

Parents:

d48afa1

Message:

• Fixed issue with installer not saving nsc.ini when upgrading from 0.3.9

Files:

• changelog (modified) (1 diff)
• helpers/installer-dlls/main_dll/main_dll.cpp (modified) (7 diffs)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

changelog

@@ -5 +5 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2011-11-14 MickeM
+ * Fixed issue with installer not saving nsc.ini when upgrading from 0.3.9
 
 2011-11-09 MickeM

helpers/installer-dlls/main_dll/main_dll.cpp

@@ -52 +52 @@
   }
   virtual void debug(std::string file, int line, std::wstring message) {
+    h->logMessage(_T("DEBUG: ") + message);
     debug_log.push_back(_T("DEBUG: ") + message);
   }
@@ -159 +160 @@
       return ERROR_SUCCESS;
     }
+
+    boost::filesystem::wpath restore_path = h.getTempPath();
+    restore_path = restore_path / (_T("old_nsc.ini"));
+    boost::filesystem::wpath old_path = target;
+    old_path = old_path / (_T("nsc.ini"));
+
+    h.logMessage(_T("Looking for old settings file (for archiving): ") + old_path.string());
+    h.logMessage(_T("Using restore path: ") + restore_path.string());
+    if (boost::filesystem::exists(old_path)) {
+      h.logMessage(_T("Found old file: ") + strEx::itos(boost::filesystem::file_size(old_path)));
+      h.setProperty(_T("RESTORE_FILE"), restore_path.string());
+      copy_file(h, old_path.string(), restore_path.string());
+    }
+    if (boost::filesystem::exists(restore_path))
+      h.logMessage(_T("Found restore file: ") + strEx::itos(boost::filesystem::file_size(restore_path)));
 
     installer_settings_provider provider(&h, target, map_data);
@@ -228 +244 @@
     }
     settings_manager::destroy_settings();
-
   } catch (installer_exception e) {
     h.logMessage(_T("Failed to read old configuration file: ") + e.what());
@@ -278 +293 @@
     data.write_string(h.getTargetPath(_T("INSTALLLOCATION")));
     data.write_string(h.getPropery(_T("CONFIGURATION_TYPE")));
+    data.write_string(h.getPropery(_T("RESTORE_FILE")));
     data.write_int(h.getPropery(_T("ADD_DEFAULTS"))==_T("1")?1:0);
 
@@ -326 +342 @@
     std::wstring target = data.get_next_string();
     std::wstring context = data.get_next_string();
+    std::wstring restore = data.get_next_string();
     int add_defaults = data.get_next_int();
 
-    //std::wstring map_data = read_map_data(h);
+    h.logMessage(_T("Target: ") + target);
+    h.logMessage(_T("Context: ") + context);
+    h.logMessage(_T("Restore: ") + restore);
+
+    boost::filesystem::wpath path = target;
+    boost::filesystem::wpath old_path = path / _T("nsc.ini.old");
+    path = path / _T("nsc.ini");
+
+    boost::filesystem::wpath restore_path = restore;
+
+    if (boost::filesystem::exists(old_path))
+      h.logMessage(_T("Found old (.old) file: ") + strEx::itos(boost::filesystem::file_size(old_path)));
+    if (boost::filesystem::exists(path))
+      h.logMessage(_T("Found old file: ") + strEx::itos(boost::filesystem::file_size(path)));
+    if (boost::filesystem::exists(restore_path))
+      h.logMessage(_T("Found restore file: ") + strEx::itos(boost::filesystem::file_size(restore_path)));
+
+    if (boost::filesystem::exists(restore_path)) {
+      if (!boost::filesystem::exists(path)) {
+        h.logMessage(_T("Restoring nsc.ini configuration file"));
+        copy_file(h, restore_path.string(), path.string());
+      }
+      if (!boost::filesystem::exists(old_path)) {
+        h.logMessage(_T("Creating backup nsc.ini.old configuration file"));
+        copy_file(h, restore_path.string(), old_path.string());
+      }
+    }
+
+    if (boost::filesystem::exists(path))
+      h.logMessage(_T("Size (001): ") + strEx::itos(boost::filesystem::file_size(path)));
 
     installer_settings_provider provider(&h, target);
@@ -335 +381 @@
       return ERROR_INSTALL_FAILURE;
     }
+    if (boost::filesystem::exists(path))
+      h.logMessage(_T("Size (002): ") + strEx::itos(boost::filesystem::file_size(path)));
+
     h.logMessage(_T("Switching to: ") + context);
     settings_manager::change_context(context);
+    if (boost::filesystem::exists(path))
+      h.logMessage(_T("Size (003): ") + strEx::itos(boost::filesystem::file_size(path)));
 
     while (data.has_more()) {
@@ -354 +405 @@
       }
     }
+    if (boost::filesystem::exists(path))
+      h.logMessage(_T("Size (004): ") + strEx::itos(boost::filesystem::file_size(path)));
     settings_manager::get_settings()->save();
+    if (boost::filesystem::exists(path))
+      h.logMessage(_T("Size (005): ") + strEx::itos(boost::filesystem::file_size(path)));
   } catch (installer_exception e) {
     h.errorMessage(_T("Failed to write configuration: ") + e.what());

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,108
-#define STRPRODUCTVER  "0,4,0,108"
-#define STRPRODUCTDATE "2011-11-13"
+#define PRODUCTVER     0,4,0,111
+#define STRPRODUCTVER  "0,4,0,111"
+#define STRPRODUCTDATE "2011-11-14"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=108
-date=2011-11-13
+build=111
+date=2011-11-14