Merge changes from PLD CVS

diff --combined client/make-request.sh
index b79854b2a9215db2ee6d8856f795996e7b85121e,bed9e64dcc282a05e4367d4a29e3e075f3880f97..a213be8b6f8767c353ff0b86e4d1ed6755c50c51
mode 100755,100644..100755
--- 1/client/make-request.sh
--- 2/client/make-request.sh
+++ b/client/make-request.sh
@@@ -200,7 -200,7 +200,7 @@@ Mandatory arguments to long options ar
              shortcut for --command poldek -ev --noask ARGS
        --upgrade-pkg
              shortcut for --command poldek --up -Uv ARGS
 -      --cvsup
 +      --pull
              Updates builders infrastructure (outside chroot)
        --update-macros
              Updates rpm-build-macros on src builder
@@@ -216,11 -216,35 +216,35 @@@ EO
        exit 0
  }
  
+ # validate distro, set $distro
+ set_distro() {
+       case "$1" in
+       ac)
+               ;;
+       ac-java|ac-xen)
+               ;;
+       ti)
+               ;;
+       ti-dev)
+               ;;
+       th)
+               ;;
+       th-java)
+               ;;
+       aidath)
+               ;;
+       *)
+               die "distro \`$1' not known"
+               ;;
+       esac
+ 
+       distro=$1
+ }
  
  while [ $# -gt 0 ] ; do
        case "$1" in
                --distro | -d)
-                       distro=$2
+                       set_distro $2
                        shift
                        ;;
  
@@@ -360,9 -384,9 +384,9 @@@
                        shift
                        ;;
  
 -              --cvsup)
 +              --pull)
                        command_flags="no-chroot"
 -                      command="cvs up"
 +                      command="git pull"
                        f_upgrade=no
                        ;;