OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in the auto-overwrite of bundled plugins.

Browse Source 
Bundled plugins should be laid down as *.jpi, with proper measure to
migrate existing bits.
This commit is contained in:
Kohsuke Kawaguchi committed 2012-01-20 13:01:25 -08:00
1 parent 79e6d15728
commit ba71264b6b
2 files changed
+13 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/PluginManager.java
+9
View File
@@ -396,10 +396,19 @@ public abstract class PluginManager extends AbstractModelObject {
* with a reasonable up-to-date check. A convenience method to be used by the {@link #loadBundledPlugins()}.
*/
protected void copyBundledPlugin(URL src, String fileName) throws IOException {
fileName = fileName.replace(".hpi",".jpi"); // normalize fileNames to have the correct suffix
String legacyName = fileName.replace(".jpi",".hpi");
long lastModified = src.openConnection().getLastModified();
File file = new File(rootDir, fileName);
File pinFile = new File(rootDir, fileName+".pinned");
{// normalization first
File legacyFile = new File(rootDir,legacyName);
if (legacyFile.exists()) legacyFile.renameTo(file);
File legacyPinFile = new File(rootDir,legacyName+".pinned");
if (legacyPinFile.exists()) legacyPinFile.renameTo(pinFile);
}
// update file if:
// - no file exists today
// - bundled version and current version differs (by timestamp), and the file isn't pinned.