Changeset 68918 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 28, 2017 4:30:45 PM (7 years ago)

Author:

vboxsync

Message:

Main,iprt: Don't fail an import just because the manifest contains more entries than what we processed during the import.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (1 diff)

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

@@ -2240 +2240 @@
         char szErr[256];
         vrc = RTManifestEqualsEx(m->hTheirManifest, m->hOurManifest, NULL /*papszIgnoreEntries*/,
-                                 NULL /*papszIgnoreAttrs*/, RTMANIFEST_EQUALS_IGN_MISSING_ATTRS, szErr, sizeof(szErr));
+                                 NULL /*papszIgnoreAttrs*/,
+                                 RTMANIFEST_EQUALS_IGN_MISSING_ATTRS | RTMANIFEST_EQUALS_IGN_MISSING_ENTRIES_2ND,
+                                 szErr, sizeof(szErr));
         if (RT_SUCCESS(vrc))
             hrc = S_OK;