Skip to content

Commit

Permalink
chore(bazel): Improve archive override URL logging
Browse files Browse the repository at this point in the history
Only log the URL(s); other properties are not really worth logging and
may literally be "(missing)".

Regarding tracking of patched dependencies, an upcoming commit will
leverage the dedicated `isModified` package property for that.

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
  • Loading branch information
sschuberth committed Aug 26, 2024
1 parent f87f923 commit d95b8b2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions plugins/package-managers/bazel/src/main/kotlin/Bazel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class Bazel(
}.associate { line ->
val (moduleName, urlsAsString, integrity, patchesAsString) = line.split(' ', limit = 4)
logger.info {
"Archive override for module '$moduleName' is '$urlsAsString, $integrity, $patchesAsString'."
"Archive override URL(s) for module '$moduleName': ${urlsAsString.removeSurrounding("[", "]")}"
}

val urls = urlsAsString.removeSurrounding("[", "]").split(',').map { URI.create(it) }
Expand Down Expand Up @@ -300,8 +300,8 @@ class Bazel(

if (archiveOverride.urls.size > 1) {
logger.warn {
"The module '${it.name}' has multiple URLs ${archiveOverride.urls} defined in the archive " +
"override, but ORT only supports one URL for source artefacts. Only the first URL will be used."
"The module '${it.name}' has multiple archive override URLs defined. Only the first URL of the " +
"following URLs will be used: ${archiveOverride.urls.joinToString()}"
}
}

Expand Down

0 comments on commit d95b8b2

Please sign in to comment.