diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi index 6629af7..98913d7 100755 --- a/webbuild/webbuild-cgi +++ b/webbuild/webbuild-cgi @@ -1034,13 +1034,13 @@ if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccr RET=$? ;; "speccreate") if [ "$SPECCREATEURL" -a "$PACKAGE" ]; then - FOUND_EXISTING=`curl -s "${WEBBUILD_DISTROQUERY_URL}?query=$PACKAGE&search_milestone2=true&search_devel=true&search_sources=true&query_compact=true&replyplain=true" | \ + FOUND_EXISTING=`curl -s "${WEBBUILD_DISTROQUERY_URL}?package=$PACKAGE&search_milestone2=true&search_devel=true&search_sources=true&query_compact=true&replyplain=true" | \ sed "s|.*\([0-9][0-9]*\) result.*|\1|"` - if [ "$FOUND_EXISTING" != "0" ]; then + if [ "$FOUND_EXISTING" != "0" -a "$FOUND_EXISTING" != "" ]; then echo -n "
" echo "ERROR: package already exists, please update from appropriate version:" echo -n "
Search results for \"$PACKAGE\":" - curl -s "${WEBBUILD_DISTROQUERY_URL}?query=$PACKAGE&search_milestone2=true&search_devel=true&search_sources=true&query_compact=true&replyplain=true" | \ + curl -s "${WEBBUILD_DISTROQUERY_URL}?package=$PACKAGE&search_milestone2=true&search_devel=true&search_sources=true&query_compact=true&replyplain=true" | \ sed "s| \(href=.\)/| \1${SITE_BASE_URL}/|g" echo -n "
" RET=1 @@ -1097,7 +1097,7 @@ if [ "$REQUEST" = "prepare" -o "$REQUEST" = "updatespec" -o "$REQUEST" = "speccr autodistjobs="$AUTODISTJOB" fi [ "$REPOSITORY" ] && REPOSITORYADD="--repository $REPOSITORY" || REPOSITORYADD="--repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]}" - $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist -v -p $autodistjobs $REPOSITORYADD --arch $AUTODISTARCH --user $USER $AUTODISTADD" + $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist -v -p $autodistjobs $REPOSITORYADD --arch $AUTODISTARCH --user $USER $AUTODISTADD -- --colors web" RET=$? ;; "autodistupdate") [ "$AUTODISTFORCE" = "true" ] && AUTODISTADD="--force" || AUTODISTADD=