cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject cordova-lib git commit: CB-8285 Fix regression caused by c49eaa86c92b (PluginInfo's are cached, don't change them)
Date Tue, 13 Jan 2015 16:01:30 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master 57b80f431 -> 23d9e7ed7


CB-8285 Fix regression caused by c49eaa86c92b (PluginInfo's are cached, don't change them)


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

Branch: refs/heads/master
Commit: 23d9e7ed7f5437a223e219c6a8a3e0cba65e0faa
Parents: 57b80f4
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Jan 13 10:58:05 2015 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Jan 13 10:58:05 2015 -0500

----------------------------------------------------------------------
 cordova-lib/src/plugman/fetch.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/23d9e7ed/cordova-lib/src/plugman/fetch.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/fetch.js b/cordova-lib/src/plugman/fetch.js
index f800b2d..1b4e6cf 100644
--- a/cordova-lib/src/plugman/fetch.js
+++ b/cordova-lib/src/plugman/fetch.js
@@ -84,6 +84,7 @@ function fetchPlugin(plugin_src, plugins_dir, options) {
             .then(function(dir) {
                 return {
                     pinfo: new PluginInfo.PluginInfo(dir),
+                    dest: dir,
                     fetchJsonSource: {
                         type: 'git',
                         url:  plugin_src,
@@ -140,14 +141,14 @@ function fetchPlugin(plugin_src, plugins_dir, options) {
             options.plugin_src_dir = result.pinfo.dir;
             return Q.when(copyPlugin(result.pinfo, plugins_dir, options.link && result.fetchJsonSource.type
== 'local'))
             .then(function(dir) {
-                result.pinfo.dir = dir;
+                result.dest = dir;
                 return result;
             });
         });
     }).then(function(result){
         checkID(options.expected_id, result.pinfo);
         metadata.save_fetch_metadata(plugins_dir, result.pinfo.id, { source: result.fetchJsonSource
});
-        return result.pinfo.dir;
+        return result.dest;
     });
 }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message