diff options
| -rw-r--r-- | releng/EnrichPoms/CBIaggregator.sh | 2 | ||||
| -rw-r--r-- | releng/EnrichPoms/publishPlatform.sh | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/releng/EnrichPoms/CBIaggregator.sh b/releng/EnrichPoms/CBIaggregator.sh index 42413b74c..6faff8369 100644 --- a/releng/EnrichPoms/CBIaggregator.sh +++ b/releng/EnrichPoms/CBIaggregator.sh @@ -45,7 +45,7 @@ function create_baseline() { fi eval VERSION_$name=$version echo VERSION_$name=$version - done > ${WORKSPACE}/baseline.txt + done > ${WORKSPACE}/baseline-next.txt cd - } diff --git a/releng/EnrichPoms/publishPlatform.sh b/releng/EnrichPoms/publishPlatform.sh index 4d3d72e43..f889b289b 100644 --- a/releng/EnrichPoms/publishPlatform.sh +++ b/releng/EnrichPoms/publishPlatform.sh @@ -48,14 +48,23 @@ function same_as_baseline() { simple=`basename $1` name=`echo $simple | sed -e "s|\(.*\)-.*|\1|" | tr '.' '_'` version=`echo $simple | sed -e "s|.*-\(.*\).pom|\1|"` - base_version=`eval echo \\${VERSION_$name}` - if [[ $base_version =~ $version ]] + base_versions=`eval echo \\${VERSION_$name}` + if [ -n $base_versions ] then - return 0 + local base_single + while read -d "," base_single + do + if [ $base_single == $version ] + then + return 0 + fi + done <<< "$base_versions" else - echo "different versions for ${name}: ${version} is not in ${base_version}" + echo "Plug-in ${name}: ${version} seems to be new" return 1 fi + echo "different versions for ${name}: ${version} is not in ${base_versions}" + return 1 } for pomFile in org/eclipse/platform/*/*/*.pom |