[ptxdist] making HTTP proxy timeout adjustable

[Schenk, Gavin]

Hi all,

I recently migrated to 2012-09 and as usual I had to work around our companies 
HTTP proxy ...
... so what about something like:

diff -Naur orig/ptxdist-2012.09.0/config/setup/Kconfig 
ptxdist-2012.09.0/config/setup/Kconfig
--- orig/ptxdist-2012.09.0/config/setup/Kconfig  2012-09-06 18:13:48.000000000 
+0200
+++ ptxdist-2012.09.0/config/setup/Kconfig      2012-09-17 09:12:02.274401151 
+0200
@@ -56,6 +56,14 @@
                          http://your.proxy.org:80
+config SETUP_HTTP_PROXY_TIMEOUT
+          prompt "HTTP Proxy timeout"
+          int
+          default "30"
+          help
+            Set maximum timeout for downloads via a http proxy
+
+
endmenu
 menu "Project Searchpath"
diff -Naur orig/ptxdist-2012.09.0/config/setup/ptxdistrc.default 
ptxdist-2012.09.0/config/setup/ptxdistrc.default
--- orig/ptxdist-2012.09.0/config/setup/ptxdistrc.default 2012-09-06 
18:13:48.000000000 +0200
+++ ptxdist-2012.09.0/config/setup/ptxdistrc.default     2012-09-17 
09:11:43.399225416 +0200
@@ -18,7 +18,7 @@
#
PTXCONF_SETUP_FTP_PROXY=""
PTXCONF_SETUP_HTTP_PROXY=""
-
+PTXCONF_SETUP_HTTP_PROXY_TIMEOUT="30"
#
# Project Searchpath
#
diff -Naur orig/ptxdist-2012.09.0/scripts/lib/ptxd_make_get.sh 
ptxdist-2012.09.0/scripts/lib/ptxd_make_get.sh
--- orig/ptxdist-2012.09.0/scripts/lib/ptxd_make_get.sh  2012-09-06 
18:13:48.000000000 +0200
+++ ptxdist-2012.09.0/scripts/lib/ptxd_make_get.sh      2012-09-17 
09:03:42.069850814 +0200
@@ -43,6 +43,13 @@
           #
           local file="${url##*/}"
+          #
+          # Proxy timeout
+          local proxytimeout= ${PTXCONF_SETUP_HTTP_PROXY_TIMEOUT}
+          if [ -z proxytimeout ]; then
+                      proxytimeout=30
+          fi
+
           # remove any pending or half downloaded files
           rm -f -- "${path}."*
@@ -50,7 +57,7 @@
           wget \
               --passive-ftp \
               --progress=bar:force \
-               --timeout=30 \
+              --timeout=${proxytimeout} \
               --tries=5 \
               ${PTXDIST_QUIET:+--quiet} \
               "${opts[@]}" \


Regards
Gavin

Eckelmann Aktiengesellschaft
Vorstand: Dr.-Ing. Gerd Eckelmann (Vorsitzender)
Dr.-Ing. Peter Cordes, Dr.-Ing. Frank-Thomas Mellert
Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
Sitz der Gesellschaft: Wiesbaden Amtsgericht Wiesbaden HRB 12636

-- 
ptxdist mailing list
ptxdist@pengutronix.de