Merge lp:~dennis/update-notifier/apt-proxies into lp:update-notifier/ubuntu

[Dennis Kaarsemaker]

Respect Acquire::http::proxy and friends

It's really annoying when apt-get works just fine, but the package-data-downloader fails because they look at different proxy settings.

[Michael Vogt (mvo)]

Hey Dennis, nice to see you again :)

I like your branch and I think its indeed pretty anoying that the data downloader does not use the native apt proxy setup. I think we could do even better by using the apt acquire system to download the file(s). I outlined this here: lp:~mvo/update-notifier/use-apt-helper. This will also make sure we support e.g. the auto proxy discovery.

What do you think? Could you give the alternative implemenation a testrun and let me know if it honors the proxy for you?

review: Needs Information

[Dennis Kaarsemaker (dennis)]

On do, 2014-06-05 at 14:16 +0000, Michael Vogt wrote:
> Review: Needs Information
>
> Hey Dennis, nice to see you again :)
>
> I like your branch and I think its indeed pretty anoying that the data
> downloader does not use the native apt proxy setup. I think we could
> do even better by using the apt acquire system to download the
> file(s). I outlined this here: lp:~mvo/update-notifier/use-apt-helper.
> This will also make sure we support e.g. the auto proxy discovery.
>
> What do you think? Could you give the alternative implemenation a
> testrun and let me know if it honors the proxy for you?

That works just fine for me, I'd prefer your solution over mine.
--
Dennis Kaarsemaker
http://www.kaarsemaker.net

Unmerged revisions

847. By Dennis Kaarsemaker on 2014-05-03

Respect Acquire::http::proxy and friends

It's really annoying when apt-get works just fine, but the
package-data-downloader fails because they look at different proxy settings.

=== modified file 'data/package-data-downloader'
--- data/package-data-downloader	2014-04-09 19:23:31 +0000
+++ data/package-data-downloader	2014-05-03 08:05:55 +0000
@@ -183,6 +183,13 @@
     proxies = {}
     try:
         for proto in ('http','https','ftp'):
+            pkey = 'Acquire::%s::proxy' % proto
+            sp = subprocess.Popen(['/usr/bin/apt-config', 'dump', pkey], stdout=subprocess.PIPE)
+            out, _ = sp.communicate()
+            for line in out.strip().splitlines():
+                key, val = line.split(None, 1)
+                if key.lower() == pkey.lower():
+                    proxies[proto] = val[1:-2]
             try:
                 proxies[proto] = os.environ[proto+"_proxy"]
             except KeyError: