Attachment 592446 Details for Bug 825011 – [PATCH][grinder] normalize proxy_url and ensure it don't have extra trailing slashes

[patch] [PATCH][grinder] normalize proxy_url and ensure it don't have extra trailing slashes

0001-normalize-proxy_url-and-ensure-it-don-t-have-extra-t.patch (text/plain), 2.71 KB, created by Satoru SATOH on 2012-06-17 15:45:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Satoru SATOH

Created: 2012-06-17 15:45:28 UTC

Size: 2.71 KB

patch

obsolete

>From 3216caaa065f6605fabdbe00bcc7f66d523f7683 Mon Sep 17 00:00:00 2001
>From: Satoru SATOH <ssato@redhat.com>
>Date: Mon, 18 Jun 2012 00:31:28 +0900
>Subject: [PATCH] normalize proxy_url and ensure it don't have extra trailing
> slashes
>
>---
> src/grinder/BaseFetch.py |   16 +++++++++++++++-
> src/grinder/YumInfo.py   |    6 +++---
> 2 files changed, 18 insertions(+), 4 deletions(-)
>
>diff --git a/src/grinder/BaseFetch.py b/src/grinder/BaseFetch.py
>index 18bb3a2..116d0c1 100755
>--- a/src/grinder/BaseFetch.py
>+++ b/src/grinder/BaseFetch.py
>@@ -27,6 +27,20 @@ from grinder.GrinderLock import GrinderLock
> LOG = logging.getLogger("grinder.BaseFetch")
> 
> 
>+def normalize_proxy_url(url):
>+    """
>+    >>> normalize_proxy_url("https://proxy.example.com/")
>+    'https://proxy.example.com'
>+    >>> normalize_proxy_url("https://proxy.example.com//")
>+    'https://proxy.example.com'
>+    >>> normalize_proxy_url("https://proxy.example.com")
>+    'https://proxy.example.com'
>+    >>> normalize_proxy_url(None)
>+    >>>
>+    """
>+    return None if url is None else url.rstrip("/")
>+
>+
> class BaseFetch(object):
>     STATUS_NOOP = 'noop'
>     STATUS_DOWNLOADED = 'downloaded'
>@@ -48,7 +62,7 @@ class BaseFetch(object):
>         self.sslcacert = cacert
>         self.sslclientcert = clicert
>         self.sslclientkey = clikey
>-        self.proxy_url = proxy_url
>+        self.proxy_url = normalize_proxy_url(proxy_url)
>         self.proxy_port = proxy_port
>         self.proxy_user = proxy_user
>         self.proxy_pass = proxy_pass
>diff --git a/src/grinder/YumInfo.py b/src/grinder/YumInfo.py
>index e5998dc..83877b8 100644
>--- a/src/grinder/YumInfo.py
>+++ b/src/grinder/YumInfo.py
>@@ -19,7 +19,7 @@ import logging
> import shutil
> import traceback
> from grinder.activeobject import ActiveObject
>-from grinder.BaseFetch import BaseFetch
>+from grinder.BaseFetch import BaseFetch, normalize_proxy_url
> from grinder.PrestoParser import PrestoParser
> from grinder.GrinderExceptions import GrinderException
> from grinder.GrinderUtils import GrinderUtils
>@@ -53,7 +53,7 @@ class YumMetadataObj(object):
>         self.sslcacert = cacert
>         self.sslclientcert = clicert
>         self.sslclientkey = clikey
>-        self.proxy_url = proxy_url
>+        self.proxy_url = _normalize_proxy_url(proxy_url)
>         self.proxy_port = proxy_port
>         self.proxy_user = proxy_user
>         self.proxy_pass = proxy_pass
>@@ -305,7 +305,7 @@ class YumInfo(object):
>         self.sslcacert = cacert
>         self.sslclientcert = clicert
>         self.sslclientkey = clikey
>-        self.proxy_url = proxy_url
>+        self.proxy_url = _normalize_proxy_url(proxy_url)
>         self.proxy_port = proxy_port
>         self.proxy_user = proxy_user
>         self.proxy_pass = proxy_pass
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 825011: 592446