Yair Zaslavsky has uploaded a new change for review. Change subject: webadmin: Fix upgrade alert check ......................................................................
webadmin: Fix upgrade alert check Change-Id: Idfb3b66994250b89b4bff9feade86b24b62a7238 Signed-off-by: Yair Zaslavsky <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java 1 file changed, 10 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/18483/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java index 3b0283e..d93432e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java @@ -17,6 +17,7 @@ import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.VDSType; import org.ovirt.engine.core.common.businessentities.VdsSpmStatus; +import org.ovirt.engine.core.common.utils.RpmVersionUtils; import org.ovirt.engine.core.compat.RpmVersion; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.compat.Version; @@ -671,7 +672,7 @@ boolean alert = false; String version_host[] = hostOs[1].split("\\."); //$NON-NLS-1$ //$NON-NLS-2$ - String release_host[] = hostOs[2].split("\\."); //$NON-NLS-1$ //$NON-NLS-2$ + String release_host = hostOs[2].trim(); for (RpmVersion iso: isos) { // Major check @@ -683,21 +684,16 @@ break; } - if (Integer.toString(iso.getRevision()).length() > release_host[0].length()) { + String rpmFromIso = iso.getRpmName(); + // Removes the ".iso" file extension , and get the release part from it + int isoIndex = iso.getRpmName().indexOf(".iso"); //$NON-NLS-1$ + if (isoIndex != -1) { + rpmFromIso = iso.getRpmName().substring(0, isoIndex); + } + String rpmRelease = RpmVersionUtils.splitRpmToParts(rpmFromIso)[2]; + if (RpmVersionUtils.compareRpmPart(rpmRelease, release_host) > 0) { alert = true; break; - } - - String releaseISO [] = Integer.toString(iso.getRevision()).split("\\."); //$NON-NLS-1$ //$NON-NLS-2$ - for (int i=0; i < release_host.length; i++) { - try { - if (Integer.parseInt(releaseISO[i].trim()) > Integer.parseInt(release_host[i].trim())) { - alert = true; - break; - } - } catch (NumberFormatException e) { - break; - } } } } -- To view, visit http://gerrit.ovirt.org/18483 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idfb3b66994250b89b4bff9feade86b24b62a7238 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
