Changeset 72511 in vbox for trunk

Timestamp:

Jun 11, 2018 2:12:17 PM (7 years ago)

Author:

vboxsync

Message:

Main/Appliance: Correctly handle appliance import when the VM is already in a group (i.e. created by VirtualBox, having <Machine> tag in the OVF file). Additionally use the usual root group notation instead of empty strings.

File:

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

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

@@ -199 +199 @@
                                  nameVBox);
 
+            /* VM Primary Group */
+            Utf8Str strPrimaryGroup;
+            if (pNewDesc->m->pConfig->machineUserData.llGroups.size())
+                strPrimaryGroup = pNewDesc->m->pConfig->machineUserData.llGroups.front();
+            if (strPrimaryGroup.isEmpty())
+                strPrimaryGroup = "/";
+            pNewDesc->i_addEntry(VirtualSystemDescriptionType_PrimaryGroup,
+                                 "",
+                                 "" /* no direct OVF correspondence */,
+                                 strPrimaryGroup);
+
             /* Based on the VM name, create a target machine path. */
             Bstr bstrSettingsFilename;
             rc = mVirtualBox->ComposeMachineFilename(Bstr(nameVBox).raw(),
-                                                     NULL /* aGroup */,
+                                                     Bstr(strPrimaryGroup).raw(),
                                                      NULL /* aCreateFlags */,
                                                      NULL /* aBaseFolder */,
@@ -212 +223 @@
 #if 1
             /* The import logic should work exactly the same whether the
-             * following 3 items are present or not, but of course it may have
+             * following 2 items are present or not, but of course it may have
              * an influence on the exact presentation of the import settings
              * of an API client. */
@@ -226 +237 @@
                                  "" /* no direct OVF correspondence */,
                                  strBaseFolder);
-            pNewDesc->i_addEntry(VirtualSystemDescriptionType_PrimaryGroup,
-                                 "",
-                                 "" /* no direct OVF correspondence */,
-                                 "");
 #endif
 
@@ -2675 +2682 @@
     /* Create the machine */
     SafeArray<BSTR> groups; /* no groups, or maybe one group... */
-    if (!stack.strPrimaryGroup.isEmpty())
+    if (!stack.strPrimaryGroup.isEmpty() && stack.strPrimaryGroup != "/")
         Bstr(stack.strPrimaryGroup).detachTo(groups.appendedRaw());
     rc = mVirtualBox->CreateMachine(Bstr(stack.strSettingsFilename).raw(),
@@ -3443 +3450 @@
     config.machineUserData.strOsType = stack.strOsTypeVBox;
     /* Groups */
-    if (!stack.strPrimaryGroup.isEmpty())
+    if (stack.strPrimaryGroup.isEmpty() || stack.strPrimaryGroup == "/")
     {
         config.machineUserData.llGroups.clear();
-        config.machineUserData.llGroups.push_back(stack.strPrimaryGroup);
+        config.machineUserData.llGroups.push_back("/");
+    }
+    else
+    {
+        /* Replace the primary group if there is one, otherwise add it. */
+        if (config.machineUserData.llGroups.size())
+            config.machineUserData.llGroups.pop_front();
+        config.machineUserData.llGroups.push_front(stack.strPrimaryGroup);
     }
     /* Description */
@@ -4003 +4017 @@
         std::list<VirtualSystemDescriptionEntry*> vsdePrimaryGroup = vsdescThis->i_findByType(VirtualSystemDescriptionType_PrimaryGroup);
         if (vsdePrimaryGroup.size() >= 1)
+        {
             stack.strPrimaryGroup = vsdePrimaryGroup.front()->strVBoxCurrent;
+            if (stack.strPrimaryGroup.isEmpty())
+                stack.strPrimaryGroup = "/";
+        }
 
         // Draw the right conclusions from the (possibly modified) VM settings