cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [1/2] git commit: CB-6076 Log message tweaks.
Date Thu, 27 Feb 2014 03:14:38 GMT
Repository: cordova-plugman
Updated Branches:
  refs/heads/master ddc20aaf1 -> 08ae8e0f7


CB-6076 Log message tweaks.


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

Branch: refs/heads/master
Commit: b9d442d7153f0f08f4dcd4f35d9ce0f306bf621e
Parents: ddc20aa
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Wed Feb 26 22:12:40 2014 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Wed Feb 26 22:12:40 2014 -0500

----------------------------------------------------------------------
 src/fetch.js   | 11 +++--------
 src/install.js |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b9d442d7/src/fetch.js
----------------------------------------------------------------------
diff --git a/src/fetch.js b/src/fetch.js
index 1d996f2..ca06852 100644
--- a/src/fetch.js
+++ b/src/fetch.js
@@ -67,9 +67,6 @@ module.exports = function fetchPlugin(plugin_src, plugins_dir, options)
{
     } else {
         // If it's not a network URL, it's either a local path or a plugin ID.
 
-        // NOTE: Can't use uri.href here as it will convert spaces to %20 and make path invalid.
-        // Use original plugin_src value instead.
-
         var p,  // The Q promise to be returned.
             linkable = true,
             plugin_dir = path.join(plugin_src, options.subdir);
@@ -82,7 +79,7 @@ module.exports = function fetchPlugin(plugin_src, plugins_dir, options)
{
             var local_dir = findLocalPlugin(plugin_src, options.searchpath);
             if (local_dir) {
                 p = Q(local_dir);
-                require('../plugman').emit('verbose', 'Found plugin "' + plugin_src + '"
at: ' + local_dir);
+                require('../plugman').emit('verbose', 'Found ' + plugin_src + ' at ' + local_dir);
             } else {
                 // If not found in local search path, fetch from the registry.
                 linkable = false;
@@ -101,10 +98,8 @@ module.exports = function fetchPlugin(plugin_src, plugins_dir, options)
{
     }
 };
 
-
 function readId(dir) {
     var xml_path = path.join(dir, 'plugin.xml');
-    require('../plugman').emit('verbose', 'Fetch is reading plugin.xml from location "' +
xml_path + '"...');
     var et = xml_helpers.parseElementtreeSync(path.join(dir, 'plugin.xml'));
     var plugin_id = et.getroot().attrib.id;
     return plugin_id;
@@ -148,11 +143,11 @@ function copyPlugin(plugin_dir, plugins_dir, link) {
     var dest = path.join(plugins_dir, plugin_id);
     shell.rm('-rf', dest);
     if (link) {
-        require('../plugman').emit('verbose', 'Symlinking from location "' + plugin_dir +
'" to location "' + dest + '"');
+        require('../plugman').emit('verbose', 'Linking plugin "' + plugin_dir + '" =>
"' + dest + '"');
         fs.symlinkSync(plugin_dir, dest, 'dir');
     } else {
         shell.mkdir('-p', dest);
-        require('../plugman').emit('verbose', 'Copying from location "' + plugin_dir + '"
to location "' + dest + '"');
+        require('../plugman').emit('verbose', 'Copying plugin "' + plugin_dir + '" =>
"' + dest + '"');
         shell.cp('-R', path.join(plugin_dir, '*') , dest);
     }
 

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/b9d442d7/src/install.js
----------------------------------------------------------------------
diff --git a/src/install.js b/src/install.js
index e0342ac..2879020 100644
--- a/src/install.js
+++ b/src/install.js
@@ -225,7 +225,7 @@ var runInstall = module.exports.runInstall = function runInstall(actions,
platfo
         }
         return Q();
     }
-    require('../plugman').emit('log', 'Installing "' + plugin_id + '" for ' + platform);
+    require('../plugman').emit('log', 'Installing ' + plugin_id + ' (' + platform + ')');
 
     var plugin_basename = path.basename(plugin_dir);
 


Mime
View raw message