Changeset 18590 in vbox for trunk/src/VBox

Timestamp:

Apr 1, 2009 9:55:02 AM (16 years ago)

Author:

vboxsync

Message:

OVF: be more strict

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -310 +310 @@
 static const osTypePattern g_osTypesPattern[] =
 {
-    {"Windows*NT",    SchemaDefs_OSTypeId_WindowsNT4},
-    {"Windows*XP",    SchemaDefs_OSTypeId_WindowsXP},
-    {"Windows*2000",  SchemaDefs_OSTypeId_Windows2000},
-    {"Windows*2003",  SchemaDefs_OSTypeId_Windows2003},
-    {"Windows*Vista", SchemaDefs_OSTypeId_WindowsVista},
-    {"Windows*2008",  SchemaDefs_OSTypeId_Windows2008},
+    {"Windows NT",    SchemaDefs_OSTypeId_WindowsNT4},
+    {"Windows XP",    SchemaDefs_OSTypeId_WindowsXP},
+    {"Windows 2000",  SchemaDefs_OSTypeId_Windows2000},
+    {"Windows 2003",  SchemaDefs_OSTypeId_Windows2003},
+    {"Windows Vista", SchemaDefs_OSTypeId_WindowsVista},
+    {"Windows 2008",  SchemaDefs_OSTypeId_Windows2008},
     {"SUSE",          SchemaDefs_OSTypeId_OpenSUSE},
     {"Novell",        SchemaDefs_OSTypeId_OpenSUSE},
-    {"Red*Hat",       SchemaDefs_OSTypeId_RedHat},
+    {"Red Hat",       SchemaDefs_OSTypeId_RedHat},
     {"Mandriva",      SchemaDefs_OSTypeId_Mandriva},
     {"Ubuntu",        SchemaDefs_OSTypeId_Ubuntu},
     {"Debian",        SchemaDefs_OSTypeId_Debian},
     {"QNX",           SchemaDefs_OSTypeId_QNX},
-    {"Linux*2.4",     SchemaDefs_OSTypeId_Linux24},
-    {"Linux*2.6",     SchemaDefs_OSTypeId_Linux26},
+    {"Linux 2.4",     SchemaDefs_OSTypeId_Linux24},
+    {"Linux 2.6",     SchemaDefs_OSTypeId_Linux26},
     {"Linux",         SchemaDefs_OSTypeId_Linux},
     {"OpenSolaris",   SchemaDefs_OSTypeId_OpenSolaris},
@@ -330 +330 @@
     {"FreeBSD",       SchemaDefs_OSTypeId_FreeBSD},
     {"NetBSD",        SchemaDefs_OSTypeId_NetBSD},
-    {"Windows*95",    SchemaDefs_OSTypeId_Windows95},
-    {"Windows*98",    SchemaDefs_OSTypeId_Windows98},
-    {"Windows*Me",    SchemaDefs_OSTypeId_WindowsMe},
-    {"Windows*3.",    SchemaDefs_OSTypeId_Windows31},
+    {"Windows 95",    SchemaDefs_OSTypeId_Windows95},
+    {"Windows 98",    SchemaDefs_OSTypeId_Windows98},
+    {"Windows Me",    SchemaDefs_OSTypeId_WindowsMe},
+    {"Windows 3.",    SchemaDefs_OSTypeId_Windows31},
     {"DOS",           SchemaDefs_OSTypeId_DOS},
     {"OS2",           SchemaDefs_OSTypeId_OS2}
@@ -341 +341 @@
 static const osTypePattern g_osTypesPattern64[] =
 {
-    {"Windows*XP",    SchemaDefs_OSTypeId_WindowsXP_64},
-    {"Windows*2003",  SchemaDefs_OSTypeId_Windows2003_64},
-    {"Windows*Vista", SchemaDefs_OSTypeId_WindowsVista_64},
-    {"Windows*2008",  SchemaDefs_OSTypeId_Windows2008_64},
+    {"Windows XP",    SchemaDefs_OSTypeId_WindowsXP_64},
+    {"Windows 2003",  SchemaDefs_OSTypeId_Windows2003_64},
+    {"Windows Vista", SchemaDefs_OSTypeId_WindowsVista_64},
+    {"Windows 2008",  SchemaDefs_OSTypeId_Windows2008_64},
     {"SUSE",          SchemaDefs_OSTypeId_OpenSUSE_64},
     {"Novell",        SchemaDefs_OSTypeId_OpenSUSE_64},
-    {"Red*Hat",       SchemaDefs_OSTypeId_RedHat_64},
+    {"Red Hat",       SchemaDefs_OSTypeId_RedHat_64},
     {"Mandriva",      SchemaDefs_OSTypeId_Mandriva_64},
     {"Ubuntu",        SchemaDefs_OSTypeId_Ubuntu_64},
     {"Debian",        SchemaDefs_OSTypeId_Debian_64},
-    {"Linux*2.4",     SchemaDefs_OSTypeId_Linux24_64},
-    {"Linux*2.6",     SchemaDefs_OSTypeId_Linux26_64},
+    {"Linux 2.4",     SchemaDefs_OSTypeId_Linux24_64},
+    {"Linux 2.6",     SchemaDefs_OSTypeId_Linux26_64},
     {"Linux",         SchemaDefs_OSTypeId_Linux26_64},
     {"OpenSolaris",   SchemaDefs_OSTypeId_OpenSolaris_64},