Changeset 63774 in vbox for trunk

Timestamp:

Sep 9, 2016 9:28:19 AM (8 years ago)

Author:

vboxsync

Message:

Main/xml/Settings.cpp: relax the version attribute requirement of the VirtualBox settings embedded in the OVF file, because there are some files floating around (not created by VirtualBox) which don't have it

Location:

trunk/src/VBox/Main/xml

Files:

• Settings.cpp (modified) (1 diff)
• VirtualBox-settings.xsd (modified) (2 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -3199 +3199 @@
 void MachineConfigFile::importMachineXML(const xml::ElementNode &elmMachine)
 {
+    // Ideally the version should be mandatory, but since VirtualBox didn't
+    // care about it until 5.1 came with different defaults, there are OVF
+    // files created by magicians (not using VirtualBox, which always wrote it)
+    // which lack this information. Let's hope that they learn to add the
+    // version when they switch to the newer settings style/defaults of 5.1.
     if (!(elmMachine.getAttributeValue("version", m->strSettingsVersionFull)))
-        throw ConfigFileError(this, &elmMachine, N_("Required Machine/@version attribute is missing"));
+        m->strSettingsVersionFull = "1.15";
 
     LogRel(("Import settings with version \"%s\"\n", m->strSettingsVersionFull.c_str()));

trunk/src/VBox/Main/xml/VirtualBox-settings.xsd

@@ -1428 +1428 @@
   <xsd:attribute name="aborted" type="xsd:boolean" default="false"/>
   <xsd:attribute name="currentStateModified" type="xsd:boolean" default="true"/>
+  <xsd:attribute name="version" type="xsd:string" default="1.15"/> <!-- Used for OVF files only, must not be present in normal settings files. The default corresponds to settings created by 5.0, which covers many older versions but not newer ones. -->
 </xsd:complexType>
 
@@ -1464 +1465 @@
     </xsd:element>
   </xsd:choice>
-  <xsd:attribute name="version" type="xsd:string"/>
+  <xsd:attribute name="version" type="xsd:string" use="required"/>
 </xsd:complexType>