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

* Updater: Fix plugin update checker (ticket #897)

Browse Source 
* Utils: Reduce logging in wrapper log when extracting zip files
This commit is contained in:
zzz
2013-07-03 17:12:32 +00:00
parent b84bfd575f
commit 0db7e2873c
6 changed files with 67 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
View File

@@ -21,6 +21,7 @@ import net.i2p.update.*;
import net.i2p.util.EepGet;
import net.i2p.util.FileUtil;
import net.i2p.util.I2PAppThread;
import net.i2p.util.Log;
import net.i2p.util.OrderedProperties;
import net.i2p.util.SecureDirectory;
import net.i2p.util.SecureFile;
@@ -147,7 +148,7 @@ class PluginUpdateRunner extends UpdateRunner {
return;
}
File tempDir = new File(_context.getTempDir(), "tmp" + _context.random().nextInt() + "-unzip");
if (!FileUtil.extractZip(to, tempDir)) {
if (!FileUtil.extractZip(to, tempDir, Log.ERROR)) {
f.delete();
to.delete();
FileUtil.rmdir(tempDir, false);
@@ -374,7 +375,7 @@ class PluginUpdateRunner extends UpdateRunner {
}
// Finally, extract the zip to the plugin directory
if (!FileUtil.extractZip(to, destDir)) {
if (!FileUtil.extractZip(to, destDir, Log.WARN)) {
to.delete();
statusDone("<b>" + _("Failed to install plugin in {0}", destDir.getAbsolutePath()) + "</b>");
return;