Author: toad
Date: 2008-12-07 00:02:37 +0000 (Sun, 07 Dec 2008)
New Revision: 24112
Modified:
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Really fix the problem: Delete all old .fblob.tmp files that we may be
responsible for.
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-12-06 23:55:15 UTC (rev 24111)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-12-07 00:02:37 UTC (rev 24112)
@@ -87,8 +87,11 @@
public static final int GRACE_TIME = 3 * 60 * 60 * 1000; // 3h
private boolean logMINOR;
private UserAlert alert;
- private static final Pattern extBuildNumberPattern =
Pattern.compile("^ext(?:-jar)?-(\\d+)\\.fblob(\\.tmp)*$");
- private static final Pattern mainBuildNumberPattern =
Pattern.compile("^main(?:-jar)?-(\\d+)\\.fblob(\\.tmp)*$");
+ private static final Pattern extBuildNumberPattern =
Pattern.compile("^ext(?:-jar)?-(\\d+)\\.fblob$");
+ private static final Pattern mainBuildNumberPattern =
Pattern.compile("^main(?:-jar)?-(\\d+)\\.fblob$");
+ private static final Pattern extTempBuildNumberPattern =
Pattern.compile("^ext(?:-jar)?-(\\d+-)?(\\d+)\\.fblob\\.tmp*$");
+ private static final Pattern mainTempBuildNumberPattern =
Pattern.compile("^main(?:-jar)?-(\\d+-)?(\\d+)\\.fblob\\.tmp*$");
+ private static final Pattern revocationTempBuildNumberPattern =
Pattern.compile("^revocation(?:-jar)?-(\\d+-)?(\\d+)\\.fblob\\.tmp*$");
public UpdateOverMandatoryManager(NodeUpdateManager manager) {
this.updateManager = manager;
@@ -1650,6 +1653,9 @@
int buildNumber;
Matcher extBuildNumberMatcher =
extBuildNumberPattern.matcher(fileName);
Matcher mainBuildNumberMatcher =
mainBuildNumberPattern.matcher(fileName);
+ Matcher extTempBuildNumberMatcher =
extTempBuildNumberPattern.matcher(fileName);
+ Matcher mainTempBuildNumberMatcher =
mainTempBuildNumberPattern.matcher(fileName);
+ Matcher revocationTempBuildNumberMatcher =
revocationTempBuildNumberPattern.matcher(fileName);
if(mainBuildNumberMatcher.matches()) {
try {
@@ -1671,6 +1677,9 @@
Logger.error(this, "Wierd file
in persistent temp: "+fileName);
return false;
}
+ } else if(mainTempBuildNumberMatcher.matches()
|| extTempBuildNumberMatcher.matches() ||
revocationTempBuildNumberMatcher.matches()) {
+ // Temporary file, can be deleted
+ return true;
}
return false;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
