Changeset 68918 in vbox

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.

Location:

trunk

Files:

• include/iprt/manifest.h (modified) (1 diff)
• src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (1 diff)
• src/VBox/Runtime/common/checksum/manifest2.cpp (modified) (2 diffs)

trunk/include/iprt/manifest.h

@@ -123 +123 @@
  * @todo implement this  */
 #define RTMANIFEST_EQUALS_IGN_MISSING_ATTRS_1ST     RT_BIT_32(1)
+/** Ignore missing entries in the 2nd manifest. */
+#define RTMANIFEST_EQUALS_IGN_MISSING_ENTRIES_2ND   RT_BIT_32(2)
 /** Mask of valid flags. */
-#define RTMANIFEST_EQUALS_VALID_MASK                UINT32_C(0x00000003)
+#define RTMANIFEST_EQUALS_VALID_MASK                UINT32_C(0x00000005)
 /** @}  */
 

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;

trunk/src/VBox/Runtime/common/checksum/manifest2.cpp

@@ -554 +554 @@
     if (!pEntry2)
     {
-        RTStrPrintf(pEquals->pszError, pEquals->cbError, "'%s' not found in the 2nd manifest", pEntry1->StrCore.pszString);
-        return VERR_NOT_EQUAL;
+        if (!(pEquals->fFlags & RTMANIFEST_EQUALS_IGN_MISSING_ENTRIES_2ND))
+        {
+            RTStrPrintf(pEquals->pszError, pEquals->cbError, "'%s' not found in the 2nd manifest", pEntry1->StrCore.pszString);
+            return VERR_NOT_EQUAL;
+        }
+        pEntry1->fVisited = true;
+        return VINF_SUCCESS;
     }
 
@@ -590 +595 @@
         AssertReturn(pThis2->u32Magic == RTMANIFEST_MAGIC, VERR_INVALID_HANDLE);
     }
-    AssertReturn(!(fFlags & ~(RTMANIFEST_EQUALS_IGN_MISSING_ATTRS)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~RTMANIFEST_EQUALS_VALID_MASK), VERR_INVALID_PARAMETER);
 
     /*