cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject cordova-lib git commit: CB-11776 check edit-config target exists
Date Thu, 01 Sep 2016 22:50:57 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master 3b38b5382 -> 905429cf6


CB-11776 check edit-config target exists

 This closes #486


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

Branch: refs/heads/master
Commit: 905429cf60084d2b0781bcf5643245e78cdf3474
Parents: 3b38b53
Author: ktop <ktop500@gmail.com>
Authored: Fri Aug 26 17:59:46 2016 -0400
Committer: Steve Gill <stevengill97@gmail.com>
Committed: Thu Sep 1 15:50:48 2016 -0700

----------------------------------------------------------------------
 cordova-common/src/ConfigChanges/ConfigChanges.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/905429cf/cordova-common/src/ConfigChanges/ConfigChanges.js
----------------------------------------------------------------------
diff --git a/cordova-common/src/ConfigChanges/ConfigChanges.js b/cordova-common/src/ConfigChanges/ConfigChanges.js
index e5b09a7..c9b9742 100644
--- a/cordova-common/src/ConfigChanges/ConfigChanges.js
+++ b/cordova-common/src/ConfigChanges/ConfigChanges.js
@@ -378,7 +378,7 @@ function is_conflicting(editchanges, config_munge, self, force) {
                 conflictingParent = editchange.target;
             }
 
-            if (target.length !== 0) {
+            if (target && target.length !== 0) {
                 // conflict has been found, exit and throw an error
                 conflictFound = true;
                 if (!force) {


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


Mime
View raw message