From c8738d410c6cab8896db091af97fbd849f7c147e Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Mon, 1 Oct 2012 16:31:53 +0200
Subject: [PATCH] bug #1495: Do not update sunstone-plugins.yaml after
 detecting new plugins.   * Sunstone plugins must be included manually to
 sunstone-plugins.yaml

---
 src/sunstone/models/SunstonePlugins.rb | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/sunstone/models/SunstonePlugins.rb b/src/sunstone/models/SunstonePlugins.rb
index 2005fe6f2e..50ad003d64 100644
--- a/src/sunstone/models/SunstonePlugins.rb
+++ b/src/sunstone/models/SunstonePlugins.rb
@@ -18,8 +18,6 @@ require 'yaml'
 require 'json'
 
 class SunstonePlugins
-    USER_PLUGIN_POLICY = false # or true to enable them by default
-
     attr_reader :plugins_conf
 
     def initialize
@@ -37,26 +35,18 @@ class SunstonePlugins
         @installed_plugins = Array.new
 
         # read user plugins
-        modified = false
         Dir[base_path+'user-plugins/*.js'].each do |p_path|
             m = p_path.match(/^#{base_path}(.*)$/)
-            if m and plugin = m[1]
-                @installed_plugins << plugin
-                if !plugins.include? plugin
-                    @plugins_conf << {plugin=>{:ALL     => USER_PLUGIN_POLICY,
-                                               :user    => nil,
-                                               :group   => nil}}
-                    modified = true
-                end
+            if m && m[1]
+                @installed_plugins << m[1]
             end
         end
-        write_conf if modified
 
         # read base plugins
         Dir[base_path+'plugins/*.js'].each do |p_path|
             m = p_path.match(/^#{base_path}(.*)$/)
-            if m and plugin = m[1]
-                @installed_plugins << plugin
+            if m && m[1]
+                @installed_plugins << m[1]
             end
         end
     end
@@ -99,12 +89,6 @@ class SunstonePlugins
         auth_plugins
     end
 
-    def write_conf
-        File.open(PLUGIN_CONFIGURATION_FILE,'w') do |f|
-            f.write(@plugins_conf.to_yaml)
-        end
-    end
-
     def to_json
         @plugins_conf.to_json
     end