From c36b35fead0db7b351fb9f6bd7127f345709dcba Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Thu, 28 Apr 2011 17:04:40 -0700
Subject: [PATCH] Manually uploading a bundled plugin should trigger pin-down.

---
 changelog.html                               | 2 ++
 core/src/main/java/hudson/PluginManager.java | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/changelog.html b/changelog.html
index bd67ae0766..d185088bc3 100644
--- a/changelog.html
+++ b/changelog.html
@@ -66,6 +66,8 @@ Upcoming changes</a>
   <li class=bug>
     404 when clicking in the weather report column of a build that hasn't yet been run.
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-9532">issue 9532</a>)
+  <li class=bug>
+    Manually uploading a bundled plugin should trigger pin-down.
   <li class=rfe>
     Add active configurations in remote API for matrix projects.
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-9248">issue 9248</a>)
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index c275fa0e5c..c288bfa2a9 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -43,6 +43,7 @@ import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.LogFactory;
 import org.jvnet.hudson.reactor.Executable;
 import org.jvnet.hudson.reactor.Reactor;
@@ -584,6 +585,10 @@ public abstract class PluginManager extends AbstractModelObject {
             fileItem.write(new File(rootDir, fileName));
             fileItem.delete();
 
+            PluginWrapper existing = getPlugin(FilenameUtils.getBaseName(fileName));
+            if (existing!=null && existing.isBundled)
+                existing.doPin();
+
             pluginUploaded = true;
 
             return new HttpRedirect(".");