Skip to content

Commit dd4fd48

Browse files
committed
melting-pot: give friendlier dep change output
The fact that the dependencies do not match since the last successful build, and therefore the component build is going to be executed, is not necessarily a bad thing. The word "mismatch" conveys something wrong; let's instead just point out what's changed, more neutrally.
1 parent 09a06a2 commit dd4fd48

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

melting-pot.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ do
663663
if [ "$bomV" ]
664664
then
665665
# G:A version is mismatched.
666-
mismatch="$mismatch\n* $g:$a:$v != $bomV"
666+
mismatch="$mismatch\n* $g:$a:$v -> $bomV"
667667
else
668668
# G:A version is not pinned.
669669
warn "$1: Unpinned dependency: $dep"
@@ -673,7 +673,7 @@ do
673673
if [ "$mismatch" ]
674674
then
675675
test "$row" -eq 1 && mismatch1=$mismatch ||
676-
debug "$1: Mismatched dependencies (vs. success #$row):$mismatch"
676+
debug "$1: Dependency changes since success #$row:$mismatch"
677677
else
678678
success=$deps
679679
break
@@ -682,7 +682,7 @@ do
682682
done
683683
test "$success" && echo "$success" || {
684684
test "$mismatch1" &&
685-
info "$1: Mismatched dependencies:$mismatch1" ||
685+
info "$1: Dependency changes since last success:$mismatch1" ||
686686
info "$1: No prior successes"
687687
}
688688
PRIOR

0 commit comments

Comments
 (0)