summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-10-27 10:46:05 -0400
committerJames Moger <james.moger@gitblit.com>2014-10-27 10:46:05 -0400
commit6ec71bc27f23c89f84bfb662ce180af3a9691dd8 (patch)
tree0e7ced487fadf2979bc3c0add1421fd21f2f3ce8
parentbe5d1452fa95788fcca760b338416a5d29923a32 (diff)
downloadgitblit-6ec71bc27f23c89f84bfb662ce180af3a9691dd8.tar.gz
gitblit-6ec71bc27f23c89f84bfb662ce180af3a9691dd8.zip
Fix PluginManager not properly respecting --noverify
-rw-r--r--releases.moxie2
-rw-r--r--src/main/java/com/gitblit/manager/PluginManager.java4
2 files changed, 6 insertions, 0 deletions
diff --git a/releases.moxie b/releases.moxie
index 446d1619..97d27bd1 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -12,12 +12,14 @@ r26: {
fixes:
- Fix French translation (pr-224, ticket-210)
- Fix raw servlet trashing paths with spaces (ticket-211)
+ - Fix PluginManager not properly respecting --noverify (ticket-209)
changes: ~
additions: ~
dependencyChanges: ~
contributors:
- Pierre Templier
- Barry Roberts
+ - Jan Å mucr
}
#
diff --git a/src/main/java/com/gitblit/manager/PluginManager.java b/src/main/java/com/gitblit/manager/PluginManager.java
index 2ee48558..5e25caa1 100644
--- a/src/main/java/com/gitblit/manager/PluginManager.java
+++ b/src/main/java/com/gitblit/manager/PluginManager.java
@@ -421,6 +421,10 @@ public class PluginManager implements IPluginManager, PluginStateListener {
protected File download(String url, boolean verifyChecksum) throws IOException {
File file = downloadFile(url);
+ if (!verifyChecksum) {
+ return file;
+ }
+
File sha1File = null;
try {
sha1File = downloadFile(url + ".sha1");