another --reg-read fix

stamparm · stamparm · commit 4c6c91a80b6b · 2010-03-12T23:12:06.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=1* delims= \" %%A IN ('REG QUERY \"" + self.__regKey + "\" /v \"" + self.__regValue + "\"') DO SET value=%%A\r\nECHO %value%\r\n"
+            readParse = "FOR /F \"tokens=*\" %%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 + "\""
 
@@ -97,7 +97,7 @@ def readRegKey(self, regKey, regValue, parse=False):
 
         data = self.evalCmd(self.__batPathRemote)
         
-        if data:
+        if data and not parse:
             pattern = '    '
             index = data.find(pattern)
             if index != -1:
