Changeset 53354 in vbox for trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

Timestamp:

Nov 19, 2014 6:32:03 PM (11 years ago)

Author:

vboxsync

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

96963

Message:

R7524 - needs testing in VBoxManage.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -751 +751 @@
     }
 
-    AssertReturn(!(m->optListImport.contains(ImportOptions_KeepAllMACs) && m->optListImport.contains(ImportOptions_KeepNATMACs)), E_INVALIDARG);
+    AssertReturn(!(m->optListImport.contains
+                   (ImportOptions_KeepAllMACs)
+                   && m->optListImport.contains(ImportOptions_KeepNATMACs)
+                  ), E_INVALIDARG);
 
     // do not allow entering this method if the appliance is busy reading or writing
@@ -2513 +2516 @@
                                      strTrgFormat,
                                      *strTargetPath,
-                                     Guid::Empty /* media registry: none yet */);
+                                     Guid::Empty /* media registry: none yet */,
+                                     DeviceType_HardDisk);
                 if (FAILED(rc)) throw rc;