Changeset 2835 for box/trunk/bin

Timestamp:

09/01/2011 01:56:36 (17 months ago)

Author:

chris

Message:

Fix incorrect generation of temporary file name for applying
patches while restoring old versions of files, many thanks to
Matto Marjanovic for debugging this issue and submitting a
patch!

File:

• box/trunk/bin/bbstored/BackupCommands.cpp (modified) (1 diff)

box/trunk/bin/bbstored/BackupCommands.cpp

@@ -389 +389 @@
                         
                         // Choose a temporary filename for the result of the combination
-                        std::ostringstream fs(rContext.GetStoreRoot());
-                        fs << ".recombinetemp.";
-                        fs << p;
-                        std::string tempFn(fs.str());
-                        tempFn = RaidFileController::DiscSetPathToFileSystemPath(rContext.GetStoreDiscSet(), tempFn, p + 16);
+                        std::ostringstream fs;
+                        fs << rContext.GetStoreRoot() << ".recombinetemp." << p;
+                        std::string tempFn = 
+                                RaidFileController::DiscSetPathToFileSystemPath(
+                                        rContext.GetStoreDiscSet(), fs.str(),
+                                        p + 16);
                         
                         // Open the temporary file