some fixes regarding registry reading

stamparm · stamparm · commit 0a2fe651ab93 · 2010-03-12T22:09:58.000Z
diff --git a/lib/takeover/registry.py b/lib/takeover/registry.py
@@ -45,7 +45,7 @@ def __initVars(self, regKey, regValue, regType=None, regData=None, parse=False):
         self.__batPathLocal  = os.path.join(conf.outputPath, "tmpr%s.bat" % self.__randStr)
 
         if parse:
-            readParse = "FOR /F \"tokens=2* delims==\" %%A IN ('REG QUERY \"" + self.__regKey + "\" /v \"" + self.__regValue + "\"') DO SET value=%%A\r\nECHO %value%\r\n"
+            readParse = "FOR /F \"tokens=1* delims= \" %%A IN ('REG QUERY \"" + self.__regKey + "\" /v \"" + self.__regValue + "\"') DO SET value=%%A\r\nECHO %value%\r\n"
         else:
             readParse = "REG QUERY \"" + self.__regKey + "\" /v \"" + self.__regValue + "\""
 
diff --git a/plugins/generic/takeover.py b/plugins/generic/takeover.py
@@ -348,7 +348,7 @@ def regRead(self):
         infoMsg = "reading Windows registry path '%s\%s' " % (regKey, regVal)
         logger.info(infoMsg)
 
-        return self.readRegKey(regKey, regVal, False)
+        return self.readRegKey(regKey, regVal, True)
 
     def regAdd(self):
         self.__regInit()
