You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2016/10/11 23:34:26 UTC
ios commit: Added CB-11998 fix into bundled cordova-common
Repository: cordova-ios
Updated Branches:
refs/heads/master f2a9eeb2e -> 2170099d3
Added CB-11998 fix into bundled cordova-common
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/2170099d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/2170099d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/2170099d
Branch: refs/heads/master
Commit: 2170099d3aaff99a239a9beba5f517d8b79d1196
Parents: f2a9eeb
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Oct 11 16:34:30 2016 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Oct 11 16:34:30 2016 -0700
----------------------------------------------------------------------
node_modules/cordova-common/src/FileUpdater.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/2170099d/node_modules/cordova-common/src/FileUpdater.js
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/src/FileUpdater.js b/node_modules/cordova-common/src/FileUpdater.js
index e97df5b..8b6876b 100644
--- a/node_modules/cordova-common/src/FileUpdater.js
+++ b/node_modules/cordova-common/src/FileUpdater.js
@@ -291,7 +291,7 @@ function mergeAndUpdateDir(sourceDirs, targetDir, options, log) {
if (!fs.existsSync(sourcePath)) {
throw new Error("Source directory does not exist: " + sourcePath);
}
- return mapDirectory(rootDir, sourcePath, include, exclude);
+ return mapDirectory(rootDir, path.relative(rootDir, sourcePath), include, exclude);
});
// Scan the files in the target directory, if it exists.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org