Changeset 16830 in vbox

Timestamp:

Feb 17, 2009 12:28:06 PM (16 years ago)

Author:

vboxsync

Message:

OVF: forgot to set item in aEnabled array to true

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageImport.cpp (modified) (3 diffs)
• Main/ApplianceImpl.cpp (modified) (5 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp

@@ -81 +81 @@
 
     Utf8Str strOvfFilename;
-    bool fExecute = false;                  // if true, then we actually do the import (-exec argument)
+    bool fExecute = true;                  // if true, then we actually do the import
 
     uint32_t ulCurVsys = (uint32_t)-1;
@@ -97 +97 @@
         bool fIsIgnore = false;
         Utf8Str strThisArg(a->argv[i]);
-        if (strThisArg == "-exec")
-            fExecute = true;
+        if (    (strThisArg == "--dry-run")
+             || (strThisArg == "-n")
+           )
+            fExecute = false;
         else if (strThisArg == "-vsys")
         {
@@ -235 +237 @@
                     bool fIgnoreThis = mapIgnoresMapsPerVsys[i][a];
 
+                    aEnabled[a] = true;
+
                     switch (t)
                     {

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1238 +1238 @@
     {
         list<VirtualSystem>::const_iterator it;
-        /* Iterate through all appliances */
+        /* Iterate through all virtual systems */
         for (it = m->llVirtualSystems.begin();
              it != m->llVirtualSystems.end();
@@ -1706 +1706 @@
             if (!task->progress.isNull())
             {
-                rc = task->progress->advanceOperation (BstrFmt(tr("Importing Virtual System %d"), i + 1));
+                rc = task->progress->advanceOperation(BstrFmt(tr("Importing Virtual System %d"), i + 1));
                 CheckComRCThrowRC(rc);
             }
@@ -1715 +1715 @@
 
             /* Guest OS type */
-            std::list<VirtualSystemDescriptionEntry*> vsdeOS = vsdescThis->findByType(VirtualSystemDescriptionType_OS);
-            ComAssertMsgThrow(vsdeOS.size() == 1, ("Guest OS Type missing"), E_FAIL);
+            std::list<VirtualSystemDescriptionEntry*> vsdeOS;
+            vsdeOS = vsdescThis->findByType(VirtualSystemDescriptionType_OS);
+            if (vsdeOS.size() < 1)
+                throw setError(VBOX_E_FILE_ERROR,
+                               tr("Missing guest OS type"));
             const Utf8Str &strOsTypeVBox = vsdeOS.front()->strConfig;
 
@@ -1727 +1730 @@
             /* First get the name */
             std::list<VirtualSystemDescriptionEntry*> vsdeName = vsdescThis->findByType(VirtualSystemDescriptionType_Name);
-            ComAssertMsgThrow(vsdeName.size() == 1, ("Guest OS name missing"), E_FAIL);
+            if (vsdeName.size() < 1)
+                throw setError(VBOX_E_FILE_ERROR,
+                               tr("Missing VM name"));
             const Utf8Str &strNameVBox = vsdeName.front()->strConfig;
             ComPtr<IMachine> pNewMachine;
@@ -2369 +2374 @@
 {
     std::list<VirtualSystemDescriptionEntry*> vsd;
+
     list<VirtualSystemDescriptionEntry>::iterator it;
     for (it = m->descriptions.begin();
          it != m->descriptions.end();
          ++it)
+    {
         if (it->type == aType)
-            vsd.push_back(&(*it));
+            vsd.push_back(pThis);
+    }
 
     return vsd;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1123 +1123 @@
         there is no way to access the object representing the
         unregistered media. It is supposed that the
-        application will do required cleanup based on the @a
-        mediaId value.
+        application will do required cleanup based on the
+        @a mediaId value.
       </desc>
       <param name="mediaId" type="uuid" dir="in">