From e7af87a98183a2b08aad65090b2cdf9ed0631e76 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 15 May 2015 19:15:51 +0000 Subject: [PATCH] Update: Ignore su3 dev build version at startup if older --- .../net/i2p/router/update/ConsoleUpdateManager.java | 12 ++++++++---- router/java/src/net/i2p/router/RouterVersion.java | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java index 8b95692ab0..885414ce14 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java @@ -194,10 +194,14 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp { register((Updater)dsuh, ROUTER_DEV_SU3, HTTP, 0); newVersion = _context.getProperty(PROP_DEV_SU3_AVAILABLE); if (newVersion != null) { - List updateSources = dsuh.getUpdateSources(); - if (dsuh != null) { - VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources); - _available.put(new UpdateItem(ROUTER_DEV_SU3, ""), newVA); + if (VersionComparator.comp(newVersion, RouterVersion.FULL_VERSION) > 0) { + List updateSources = dsuh.getUpdateSources(); + if (dsuh != null) { + VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources); + _available.put(new UpdateItem(ROUTER_DEV_SU3, ""), newVA); + } + } else { + _context.router().saveConfig(PROP_DEV_SU3_AVAILABLE, null); } } diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 9535f12e9f..f7d70ed0aa 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 23; + public final static long BUILD = 24; /** for example "-test" */ public final static String EXTRA = "-rc";