diff --git a/vim-update.sh b/vim-update.sh index 45e82f1..43852b6 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -149,19 +149,19 @@ if [ $CHANGES -ne 0 ]; then releases_regexp="$releases_regexp${regexps[@]: regexp_index: 1}" fi - # Check if release has pending or testing update - if not, build package + # Check if release has an update in testing - if not, build package # and submit update for testing - # | grep $releases_regexp` - # done_build is checking, if previous branch did build - lower branch can do + # done_build is a check, if previous branch did build - lower branch can do # a build only when higher branch build was ok. testing_update=`bodhi updates query --packages vim --status testing \ | grep $releases_regexp` if [ "$testing_update" == "" ] && [ $done_build -eq 1 ]; then $debug fedpkg build if [ $? -eq 0 ]; then - # if branch isn't rawhide or branch is enabled in bodhi, suggest creating update in the end + # if branch isn't rawhide or branch is enabled in bodhi, create the update if newer branch does + # not have an update in testing if [ $branch != "rawhide" ] || [ ${bodhi_enabled[@]: $bodhi_enabled_index: 1} -eq 1 ]; then - needs_update+=("bodhi updates new --user $(rpmdev-packager) --type enhancement --notes \"The newest upstream commit\" --request testing --autotime --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1}") + $debug bodhi updates new --user $(rpmdev-packager) --type enhancement --notes "The newest upstream commit" --request testing --autotime --autokarma --stable-karma 3 --unstable-karma -3 vim-${UPSTREAMMAJOR}.${LASTPLFILLED}-1.${releases[@]: $release_index: 1} fi else echo "Error when building package for $branch" @@ -194,16 +194,4 @@ $debug fedpkg switch-branch rawhide # prevents #1931099 $debug rm -rf vim-upstream -if [ ${#needs_update[@]} -eq 0 ] -then - exit 0 -fi - -echo "Issue the following commands once its gating tests pass:" - -for update in "${needs_update[@]}" -do - echo $update -done - exit 0