cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject git commit: fix for failing test in plugin uninstallation.
Date Mon, 03 Jun 2013 21:11:39 GMT
Updated Branches:
  refs/heads/ensure_config 9bac11010 -> 2694d3bde


fix for failing test in plugin uninstallation.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/2694d3bd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/2694d3bd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/2694d3bd

Branch: refs/heads/ensure_config
Commit: 2694d3bde2cbbfd0e0ba46e203b2e7394ff6a9c3
Parents: 9bac110
Author: Fil Maj <maj.fil@gmail.com>
Authored: Mon Jun 3 14:11:35 2013 -0700
Committer: Fil Maj <maj.fil@gmail.com>
Committed: Mon Jun 3 14:11:35 2013 -0700

----------------------------------------------------------------------
 src/util/config-changes.js |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/2694d3bd/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index b37b22a..4a4d7ac 100644
--- a/src/util/config-changes.js
+++ b/src/util/config-changes.js
@@ -131,9 +131,10 @@ module.exports = {
         });
         return munge;
     },
-    remove_plugin_changes:function(platform, project_dir, plugins_dir, plugin_id, plugin_vars,
is_top_level, should_decrement) {
+
+    remove_plugin_changes:function(platform, project_dir, plugins_dir, plugin_name, plugin_id,
is_top_level, should_decrement) {
         var platform_config = module.exports.get_platform_json(plugins_dir, platform);
-        var plugin_dir = path.join(plugins_dir, plugin_id);
+        var plugin_dir = path.join(plugins_dir, plugin_name);
         var plugin_vars = (is_top_level ? platform_config.installed_plugins[plugin_id] :
platform_config.dependent_plugins[plugin_id]);
 
         // get config munge, aka how did this plugin change various config files
@@ -268,7 +269,6 @@ module.exports = {
                                 if (path.extname(filepath) == '.xml') {
                                     var xml_to_graft = [et.XML(xml_child)];
                                     var doc = xml_helpers.parseElementtreeSync(filepath);
-                                    console.log(filepath, selector, xml_child);
                                     if (xml_helpers.graftXML(doc, xml_to_graft, selector))
{
                                         // were good, write out the file!
                                         fs.writeFileSync(filepath, doc.write({indent: 4}),
'utf-8');
@@ -313,7 +313,7 @@ module.exports = {
 
         // Uninstallation first
         platform_config.prepare_queue.uninstalled.forEach(function(u) {
-            module.exports.remove_plugin_changes(platform, project_dir, plugins_dir, u.plugin,
u.vars, u.topLevel, true);
+            module.exports.remove_plugin_changes(platform, project_dir, plugins_dir, u.plugin,
u.id, u.topLevel, true);
         });
 
         // Now handle installation


Mime
View raw message