echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: Ignore su3 dev build version at startup if older

Browse Source
This commit is contained in:
zzz
2015-05-15 19:15:51 +00:00
parent d698a67660
commit e7af87a981
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
View File

@ -194,10 +194,14 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
register((Updater)dsuh, ROUTER_DEV_SU3, HTTP, 0); register((Updater)dsuh, ROUTER_DEV_SU3, HTTP, 0);
newVersion = _context.getProperty(PROP_DEV_SU3_AVAILABLE); newVersion = _context.getProperty(PROP_DEV_SU3_AVAILABLE);
if (newVersion != null) { if (newVersion != null) {
List<URI> updateSources = dsuh.getUpdateSources(); if (VersionComparator.comp(newVersion, RouterVersion.FULL_VERSION) > 0) {
if (dsuh != null) { List<URI> updateSources = dsuh.getUpdateSources();
VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources); if (dsuh != null) {
_available.put(new UpdateItem(ROUTER_DEV_SU3, ""), newVA); VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
_available.put(new UpdateItem(ROUTER_DEV_SU3, ""), newVA);
}
} else {
_context.router().saveConfig(PROP_DEV_SU3_AVAILABLE, null);
} }
} }

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 23; public final static long BUILD = 24;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";