X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=builder.sh;h=a5b8edc233598c0ddd26de77c09cb6baa916ba6e;hb=58190efb023a02475ced88a938bcc9fe0eb3a313;hp=7be3210438c98709d8827a9c7f06a1ea79ff4aeb;hpb=6ff389efbc11a7bd37bc23ea435653111871c115;p=packages%2Frpm-build-tools.git diff --git a/builder.sh b/builder.sh index 7be3210..a5b8edc 100755 --- a/builder.sh +++ b/builder.sh @@ -123,7 +123,7 @@ WGET_RETRIES=${MAX_WGET_RETRIES:-0} # rsync repository with git refs of packages PKGREVS_URL="http://pkgrevs.tld-linux.org" -PKGREVS_PREFIX="auto/ti/" +PKGREVS_PREFIX="tld/" SETPKGREV="false" # TLD git/df config @@ -891,9 +891,9 @@ Exit_error() { remove_build_requires echo >&2 "Error: couldn't get out package name/version/release from spec file." exit 6 ;; - "err_tag_exists" ) + "err_pkgrev_exists" ) remove_build_requires - echo >&2 "Tag ${2} already exists" + echo >&2 "Error: package revision ${2} already exists" exit 9 ;; "err_fract_rel" ) remove_build_requires @@ -1505,7 +1505,7 @@ set_pkgrev() { rm $_tmp 2>/dev/null [ "$(get_pkgrev "$_tag")" = "$CVSTAG" ] && return 0 echo "$result" | grep -q -E "^OK$" && return 0 - echo "$result" | grep -q -E "^EXISTS$" && Exit_error err_tag_exists "$_tag" + echo "$result" | grep -q -E "^EXISTS$" && Exit_error err_pkgrev_exists "$_tag" Exit_error err_pkgrev_set }