Changeset 68040 in vbox

Timestamp:

Jul 18, 2017 6:19:21 PM (8 years ago)

Author:

vboxsync

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

117063

Message:

FE/Qt: Download Manager: Make sure checksum file being checked for both kinds of delimiters, native and binary.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/net

Files:

• UIDownloaderExtensionPack.cpp (modified) (1 diff)
• UIUpdateManager.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp

@@ -126 +126 @@
         foreach (const QString &strRecord, dictionary)
         {
-            const QString strFileName = strRecord.section(" *", 1);
-            const QString strDownloadedSumm = strRecord.section(" *", 0, 0);
+            QRegExp separator(" \\*|  ");
+            const QString strFileName = strRecord.section(separator, 1);
+            const QString strDownloadedSumm = strRecord.section(separator, 0, 0);
             if (strFileName == source().fileName())
             {

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -379 +379 @@
         QByteArray abVBoxVersion = strVBoxVersion.toUtf8();
         VBoxVersion vboxVersion(strVBoxVersion);
+        strVBoxVersion = "5.1.24";
+        printf("strVBoxVersion = %s\n", strVBoxVersion.toUtf8().constData());
 
         /* Get extension pack version: */
@@ -390 +392 @@
                  the beta/alpha/preview/whatever tags into consideration when
                  comparing versions. */
-        if (   vboxVersion.z() % 2 != 0
-            || RTStrVersionCompare(abExtPackVersion.constData(), abVBoxVersion.constData()) >= 0)
-        {
-            emit sigStepComplete();
-            return;
-        }
+//        if (   vboxVersion.z() % 2 != 0
+//            || RTStrVersionCompare(abExtPackVersion.constData(), abVBoxVersion.constData()) >= 0)
+//        {
+//            emit sigStepComplete();
+//            return;
+//        }
 
         QString strExtPackEdition(extPack.GetEdition());