public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Brian Dolbec" <brian.dolbec@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mirrorselect:ssl commit in: mirrorselect/
Date: Sun,  2 Mar 2014 07:44:52 +0000 (UTC)	[thread overview]
Message-ID: <1391226839.dc98292e2aeca8ec13aceb2efce802d9375e11aa.dol-sen@gentoo> (raw)

commit:     dc98292e2aeca8ec13aceb2efce802d9375e11aa
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  1 03:49:11 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Feb  1 03:53:59 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mirrorselect.git;a=commit;h=dc98292e

Tweak the proxy code to correctly handle the cli option.

---
 mirrorselect/extractor.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
index 217d1e1..eb26faf 100644
--- a/mirrorselect/extractor.py
+++ b/mirrorselect/extractor.py
@@ -58,10 +58,11 @@ class Extractor(object):
 		self.proxies = {}
 
 		for proxy in ['http_proxy', 'https_proxy']:
-			if options.proxy:
-				self.proxies[proxy.split('_')[0]] = options.proxy
+			prox = proxy.split('_')[0]
+			if options.proxy and prox + ":" in options.proxy:
+				self.proxies[prox] = options.proxy
 			elif os.getenv(proxy):
-				self.proxies[proxy.split('_')[0]] = os.getenv(proxy)
+				self.proxies[prox] = os.getenv(proxy)
 
 		parser = MirrorParser3()
 		self.hosts = []


WARNING: multiple messages have this Message-ID (diff)
From: "Brian Dolbec" <brian.dolbec@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mirrorselect:master commit in: mirrorselect/
Date: Sun,  2 Mar 2014 07:44:08 +0000 (UTC)	[thread overview]
Message-ID: <1391226839.dc98292e2aeca8ec13aceb2efce802d9375e11aa.dol-sen@gentoo> (raw)
Message-ID: <20140302074408.VItKwrwW-8Yj4RmjFehfX6fwLJsrP03LEkRbF-FGcb4@z> (raw)

commit:     dc98292e2aeca8ec13aceb2efce802d9375e11aa
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  1 03:49:11 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Feb  1 03:53:59 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mirrorselect.git;a=commit;h=dc98292e

Tweak the proxy code to correctly handle the cli option.

---
 mirrorselect/extractor.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
index 217d1e1..eb26faf 100644
--- a/mirrorselect/extractor.py
+++ b/mirrorselect/extractor.py
@@ -58,10 +58,11 @@ class Extractor(object):
 		self.proxies = {}
 
 		for proxy in ['http_proxy', 'https_proxy']:
-			if options.proxy:
-				self.proxies[proxy.split('_')[0]] = options.proxy
+			prox = proxy.split('_')[0]
+			if options.proxy and prox + ":" in options.proxy:
+				self.proxies[prox] = options.proxy
 			elif os.getenv(proxy):
-				self.proxies[proxy.split('_')[0]] = os.getenv(proxy)
+				self.proxies[prox] = os.getenv(proxy)
 
 		parser = MirrorParser3()
 		self.hosts = []


             reply	other threads:[~2014-03-02  7:44 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-02  7:44 Brian Dolbec [this message]
2014-03-02  7:44 ` [gentoo-commits] proj/mirrorselect:master commit in: mirrorselect/ Brian Dolbec
  -- strict thread matches above, loose matches on Subject: below --
2014-03-02  7:44 Brian Dolbec
2014-01-31 15:44 ` [gentoo-commits] proj/mirrorselect:ssl " Brian Dolbec
2014-03-02  7:44 [gentoo-commits] proj/mirrorselect:master " Brian Dolbec
2014-01-31 15:44 ` [gentoo-commits] proj/mirrorselect:ssl " Brian Dolbec
2014-01-31 15:44 Brian Dolbec
2013-10-20 18:19 Brian Dolbec
2013-10-20  8:16 Brian Dolbec

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1391226839.dc98292e2aeca8ec13aceb2efce802d9375e11aa.dol-sen@gentoo \
    --to=brian.dolbec@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox