Attachment 634983 Details for Bug 871019 – (possible) correct fixes for cases that wget and/or curl do not print error messages previous code expected

[patch] (possible) correct fixes for cases that wget and/or curl do not print error messages previous code expected

0001-possible-correct-fixes-for-cases-that-wget-and-or-cu.patch (text/plain), 1.74 KB, created by Satoru SATOH on 2012-10-29 12:15:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Satoru SATOH

Created: 2012-10-29 12:15:59 UTC

Size: 1.74 KB

patch

obsolete

>From 14f04a34c7b010fb273157b7275a69e01f446faf Mon Sep 17 00:00:00 2001
>From: Satoru SATOH <satoru.satoh@gmail.com>
>Date: Mon, 29 Oct 2012 20:53:15 +0900
>Subject: [PATCH] (possible) correct fixes for cases that wget and/or curl do
> not print error messages previous code expected
>
>---
> spacewalk/certs-tools/rhn_bootstrap_strings.py | 21 ++++++---------------
> 1 file changed, 6 insertions(+), 15 deletions(-)
>
>diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py b/spacewalk/certs-tools/rhn_bootstrap_strings.py
>index 5e443fc..a641270 100644
>--- a/spacewalk/certs-tools/rhn_bootstrap_strings.py
>+++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py
>@@ -136,23 +136,14 @@ PROFILENAME=""   # Empty by default to let it be set automatically.
> # command accordingly.
> 
> if [ -x /usr/bin/wget ] ; then
>-    output=`LANG=en_US /usr/bin/wget --no-check-certificate 2>&1`
>-    error=`echo $output | grep "unrecognized option"`
>-    if [ -z "$error" ] ; then
>-        FETCH="/usr/bin/wget -q -r -nd --no-check-certificate"
>-    else
>-        FETCH="/usr/bin/wget -q -r -nd"
>-    fi
>-
>+    FETCH="/usr/bin/wget -q -r -nd"
>+    LANG=en_US /usr/bin/wget --help | grep '\-\-no-check-certificate' 2>&1 > /dev/null && \
>+        FETCH="$FETCH --no-check-certificate" || :
> else
>     if [ -x /usr/bin/curl ] ; then
>-        output=`LANG=en_US /usr/bin/curl -k 2>&1`
>-        error=`echo $output | grep "is unknown"`
>-        if [ -z "$error" ] ; then
>-            FETCH="/usr/bin/curl -SksO"
>-        else
>-            FETCH="/usr/bin/curl -SsO"
>-        fi
>+        FETCH="/usr/bin/curl -SsO"
>+        LANG=en_US /usr/bin/curl --help | grep '\-\-insecure' 2>&1 > /dev/null && \
>+            FETCH="$FETCH --insecure" || :
>     fi
> fi
> HTTP_PUB_DIRECTORY=http://${HOSTNAME}/%s
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 871019: 634983