Merge lp:ubuntu/oneiric-updates/distribute into lp:ubuntu/oneiric/distribute

[Damian Manig]

[James Page (james-page)]

Hi Julian

I see this change has already made it to oneiric-updates; the merge into the main oneiric branch is not required.

Please could you delete this merge proposal.

Regards

James

review: Needs Fixing

Unmerged revisions

17. By Julian Taylor on 2012-02-14

* setuptools/package_index.py:
  - add easy_install HTTPMessage fix from 0.6.19 (LP: #910965)

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-20 11:30:25 +0000
+++ debian/changelog	2012-02-28 01:38:18 +0000
@@ -1,3 +1,10 @@
+distribute (0.6.16-1ubuntu0.1) oneiric-proposed; urgency=low
+
+  * setuptools/package_index.py:
+    - add easy_install HTTPMessage fix from 0.6.19 (LP: #910965)
+
+ -- Julian Taylor <[e-mail]>  Tue, 14 Feb 2012 23:28:12 -0800
+
 distribute (0.6.16-1) unstable; urgency=medium
 
   * New upstream version.

=== modified file 'debian/control'
--- debian/control	2011-05-20 11:30:25 +0000
+++ debian/control	2012-02-28 01:38:18 +0000
@@ -1,7 +1,8 @@
 Source: distribute
 Section: python
 Priority: optional
-Maintainer: Matthias Klose <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Matthias Klose <[e-mail]>
 Build-Depends-Indep: python-all-dev (>= 2.6.6-2~), python3-all-dev (>= 3.1.2-8~), python-sphinx
 Build-Depends: debhelper (>= 5.0.37.1)
 XS-Python-Version: 2.7

=== modified file 'setuptools/package_index.py'
--- setuptools/package_index.py	2011-05-20 11:30:25 +0000
+++ setuptools/package_index.py	2012-02-28 01:38:18 +0000
@@ -580,7 +580,7 @@
             size = -1
             if "content-length" in headers:
                 # Some servers return multiple Content-Length headers :(
-                content_length = headers.getheaders("Content-Length")[0]
+                content_length = headers.get("Content-Length")
                 size = int(content_length)
                 self.reporthook(url, filename, blocknum, bs, size)
             tfp = open(filename,'wb')