Changeset 13578 in josm

Timestamp:

2018-03-27T18:19:54+02:00 (7 years ago)

Author:

stoecker

Message:

don't warn when one of the two terms-of-use/permission-ref matches

File:

• trunk/scripts/SyncEditorLayerIndex.groovy (modified) (2 diffs)

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -548 +548 @@
             et = getPermissionReferenceUrl(e)
             jt = getPermissionReferenceUrl(j)
-            if (!jt) jt = getTermsOfUseUrl(j)
+            def jt2 = getTermsOfUseUrl(j)
+            if (!jt) jt = jt2
             if (!et.equals(jt)) {
                 if (!jt) {
@@ -554 +555 @@
                 } else if (et) {
                     def ethttps = et.replace("http:","https:")
-                    if(jt.equals(ethttps) || jt.equals(et+"/") || jt.equals(ethttps+"/")) {
-                        myprintln "+ License URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
-                    } else {
-                        myprintln "* License URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
+                    if(!jt2 || !(jt2.equals(ethttps) || jt2.equals(et+"/") || jt2.equals(ethttps+"/"))) {
+                        if(jt.equals(ethttps) || jt.equals(et+"/") || jt.equals(ethttps+"/")) {
+                            myprintln "+ License URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
+                        } else {
+                            myprintln "* License URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
+                        }
                     }
                 } else if (!options.nomissingeli) {