- hostname changed

[tld-builder.git] / client / make-request.sh

diff --git a/client/make-request.sh b/client/make-request.sh
index a14bd7c5ffadd4308f3f7a125f7f5e4f3d094988..e384c1337affc1d7e0217fd5ca01f9c4d91f7687 100755 (executable)
--- a/client/make-request.sh
+++ b/client/make-request.sh
@@ -45,7 +45,7 @@ url="$url"
 mailer="/usr/lib/sendmail -t"
 gpg_opts=""
 dist=ti
-url="http://kraz.tld-linux.org:1231/"
+url="https://giant.tld-linux.org:1241/"
 
 # defaults:
 f_upgrade=yes
@@ -102,7 +102,14 @@ send_request() {
        *)
                msg "Sending using HTTP mode to $url"
                cat - | python -c '
-import sys, socket, urllib2
+import sys, socket, urllib2, ssl
+
+try:
+    _create_unverified_https_context = ssl._create_unverified_context
+except AttributeError:
+    pass
+else:
+    ssl._create_default_https_context = _create_unverified_https_context
 
 try:
         data = sys.stdin.read()
@@ -189,7 +196,7 @@ autotag() {
 # get autotag for specs
 # WARNING: This may checkout some files from VCS
 get_autotag() {
-       local pkg spec rpmdir
+       local atag pkg spec rpmdir
 
        rpmdir=$(rpm -E %_topdir)
        for pkg in "$@"; do
@@ -198,16 +205,13 @@ get_autotag() {
                pkg=${pkg%:*}
                # strip .spec extension
                pkg=${pkg%.spec}
-               # checkout only if missing
-               if [ ! -e $pkg/$pkg.spec ]; then
-                       $rpmdir/builder -g $pkg -ns -r HEAD 1>&2
-               fi
-               if [ ! -e $pkg/$pkg.spec ]; then
-                       # just print it out, to fallback to base pkg name
-                       echo "$pkg"
+               wget http://pkgrevs.tld-linux.org/list/$pkg -O /tmp/$pkg.tags 1>/dev/null 2>&1
+               atag=$(head -n 1 /tmp/$pkg.tags)
+               rm -f /tmp/$pkg.tags
+               if [ "x$atag" = "x" ]; then
+                       echo "$pkg.spec"
                else
-                       cd $pkg
-                       autotag $pkg.spec
+                       echo "$pkg.spec:$atag"
                fi
        done
 }
@@ -534,16 +538,16 @@ done
 
 case "$dist" in
 ti)
-       builder_email="builderti@kraz.tld-linux.org"
+       builder_email="builderti@giant.tld-linux.org"
        default_builders="ti-*"
-       url="http://kraz.tld-linux.org:1231/"
-       control_url="http://kraz.tld-linux.org/~builderti"
+       url="https://giant.tld-linux.org:1241/"
+       control_url="http://giant.tld-linux.org/~builderti"
        ;;
 ti-dev)
-       builder_email="buildertidev@kraz.tld-linux.org"
+       builder_email="buildertidev@giant.tld-linux.org"
        default_builders="ti-dev-*"
-       url="http://kraz.tld-linux.org:1232/"
-       control_url="http://kraz.tld-linux.org/~buildertidev"
+       url="https://giant.tld-linux.org:1242/"
+       control_url="http://giant.tld-linux.org/~buildertidev"
        ;;
 *)
        die "dist \`$dist' not known"