Changeset 46972 in vbox

Timestamp:

Jul 4, 2013 8:57:23 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86980

Message:

pr6022. Relative paths in the OVA package are processed from now.

Location:

trunk/src/VBox

Files:

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

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

@@ -2110 +2110 @@
 
     const Utf8Str &strSourceOVF = di.strHref;
+
+    Utf8Str strSrcFilePath(stack.strSourceDir);
     /* Construct source file path */
-    Utf8StrFmt strSrcFilePath("%s%c%s", stack.strSourceDir.c_str(), RTPATH_DELIMITER, strSourceOVF.c_str());
+    Utf8Str name = applianceIOName(applianceIOTar);
+
+    if (RTStrNICmp(pStorage->pVDImageIfaces->pszInterfaceName, name.c_str(), name.length()) == 0)
+        strSrcFilePath = strSourceOVF;
+    else
+    {
+        strSrcFilePath.append(RTPATH_SLASH_STR);
+        strSrcFilePath.append(strSourceOVF);
+    }
 
     /* First of all check if the path is an UUID. If so, the user like to

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

@@ -455 +455 @@
         for (size_t i = 0; i < cTests; ++i)
         {
-            if (!RTStrCmp(RTPathFilename(paFiles[i].pTestPattern->pszTestFile), RTStrStrip(pszName)))
+            if (RTStrStr(paFiles[i].pTestPattern->pszTestFile, RTStrStrip(pszName)) != NULL)
             {
                 /* Add the data of the manifest file to the file list */
@@ -492 +492 @@
             }
 
-            /* Do the manifest SHA1 digest match against the actual digest? */
+            /* Do the manifest SHA digest match against the actual digest? */
             if (RTStrICmp(paFiles[i].pszManifestDigest, paFiles[i].pTestPattern->pszTestDigest))
             {