Changeset 77500 in vbox for trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

Timestamp:

Feb 28, 2019 11:13:24 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

129095

Message:

Guest Control/Main: Respect dry run in GuestSessionTaskCopy[From|To]::Run().

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -1563 +1563 @@
 
         /* Create the root directory. */
-        if (pList->mSourceSpec.enmType == FsObjType_Directory)
+        if (   pList->mSourceSpec.enmType == FsObjType_Directory
+            && pList->mSourceSpec.fDryRun == false)
         {
             rc = directoryCreateOnHost(pList->mDstRootAbs.c_str(), fDirMode, fDirCreate, fCopyIntoExisting);
@@ -1594 +1595 @@
                     LogFlowFunc(("Directory '%s': %s -> %s\n", pEntry->strPath.c_str(), strSrcAbs.c_str(), strDstAbs.c_str()));
                     if (!pList->mSourceSpec.fDryRun)
-                    {
                         rc = directoryCreateOnHost(strDstAbs.c_str(), fDirMode, fDirCreate, fCopyIntoExisting);
-                        if (RT_FAILURE(rc))
-                            break;
-                    }
                     break;
 
@@ -1807 +1804 @@
             fFollowSymlinks   = pList->mSourceSpec.Type.Dir.fFollowSymlinks;
 
-            rc = directoryCreateOnGuest(pList->mDstRootAbs.c_str(), DirectoryCreateFlag_None, fDirMode,
-                                        pList->mSourceSpec.Type.Dir.fFollowSymlinks, fCopyIntoExisting);
-            if (RT_FAILURE(rc))
-                break;
+            if (pList->mSourceSpec.fDryRun == false)
+            {
+                rc = directoryCreateOnGuest(pList->mDstRootAbs.c_str(), DirectoryCreateFlag_None, fDirMode,
+                                            fFollowSymlinks, fCopyIntoExisting);
+                if (RT_FAILURE(rc))
+                    break;
+            }
         }
         else if (pList->mSourceSpec.enmType == FsObjType_File)