Changeset 70850 in vbox

Timestamp:

Feb 1, 2018 3:54:31 PM (7 years ago)

Author:

vboxsync

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

120667

Message:

FE/Qt: bugref:9104: Small fix for UIUpdateManager, allow to check for recent EP from release branches to ease the testing.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp (modified) (1 diff)

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

@@ -366 +366 @@
 
         /* Get VirtualBox version: */
-        QString strVBoxVersion(vboxGlobal().vboxVersionStringNormalized());
-        QByteArray abVBoxVersion = strVBoxVersion.toUtf8();
-        UIVersion vboxVersion(strVBoxVersion);
-
+        UIVersion vboxVersion(vboxGlobal().vboxVersionStringNormalized());
         /* Get extension pack version: */
         QString strExtPackVersion(extPack.GetVersion());
         QByteArray abExtPackVersion = strExtPackVersion.toUtf8();
 
-        /* Skip the check in unstable VBox version and if the extension pack
-           is equal to or newer than VBox.
-
-           Note! Use RTStrVersionCompare for the comparison here as it takes
-                 the beta/alpha/preview/whatever tags into consideration when
-                 comparing versions. */
-        if (   vboxVersion.z() % 2 != 0
-            || RTStrVersionCompare(abExtPackVersion.constData(), abVBoxVersion.constData()) >= 0)
+        /* If this version being developed: */
+        if (vboxVersion.z() % 2 == 1)
+        {
+            /* If this version being developed on release branch (we use released one): */
+            if (vboxVersion.z() < 97)
+                vboxVersion.setZ(vboxVersion.z() - 1);
+            /* If this version being developed on trunk (we skip check at all): */
+            else
+            {
+                emit sigStepComplete();
+                return;
+            }
+        }
+
+        /* Get updated VirtualBox version: */
+        const QString strVBoxVersion = vboxVersion.toString();
+
+        /* Skip the check if the extension pack is equal to or newer than VBox.
+         * Note! Use RTStrVersionCompare for the comparison here as it takes the
+         *       beta/alpha/preview/whatever tags into consideration when comparing versions. */
+        if (RTStrVersionCompare(abExtPackVersion.constData(), strVBoxVersion.toUtf8().constData()) >= 0)
         {
             emit sigStepComplete();