Merge lp:~jelmer/launchpad/dulwich-fix-double-slash into lp:launchpad

Proposed by Jelmer Vernooij
Status: Merged
Approved by: William Grant
Approved revision: no longer in the source branch.
Merged at revision: 14001
Proposed branch: lp:~jelmer/launchpad/dulwich-fix-double-slash
Merge into: lp:launchpad
Diff against target: 42 lines (+6/-6)
2 files modified
utilities/sourcedeps.cache (+4/-4)
utilities/sourcedeps.conf (+2/-2)
To merge this branch: bzr merge lp:~jelmer/launchpad/dulwich-fix-double-slash
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+76202@code.launchpad.net

Commit message

[r=wgrant][bug=854647] Update to a newer Dulwich which no longer makes HTTP requests that contain multiple consecutive slashes.

Description of the change

Update to a newer version of Dulwich, which no longer makes HTTP requests that contain
multiple consecutive slashes. Some Git servers will return a 404 in case of
multiple consecutive slashes.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) wrote :

Can you run update-sourcecode to update sourcedeps.cache? Otherwise everyone will probably end up with a diff. Thanks!

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache 2011-09-15 11:25:06 +0000
+++ utilities/sourcedeps.cache 2011-09-20 23:52:17 +0000
@@ -4,8 +4,8 @@
4 "launchpad@pqm.canonical.com-20101123183213-777lz46xgagn1deg"4 "launchpad@pqm.canonical.com-20101123183213-777lz46xgagn1deg"
5 ], 5 ],
6 "bzr-git": [6 "bzr-git": [
7 265, 7 266,
8 "launchpad@pqm.canonical.com-20110915105414-52uqfoxszikfa8l0"8 "launchpad@pqm.canonical.com-20110920132415-uxxt8vjsfxgu7hcs"
9 ], 9 ],
10 "bzr-hg": [10 "bzr-hg": [
11 291, 11 291,
@@ -28,8 +28,8 @@
28 "aaron@aaronbentley.com-20100715135013-uoi3q430urx9gwb8"28 "aaron@aaronbentley.com-20100715135013-uoi3q430urx9gwb8"
29 ], 29 ],
30 "dulwich": [30 "dulwich": [
31 430, 31 431,
32 "launchpad@pqm.canonical.com-20110913014713-3l8j2zva6pgor5uw"32 "launchpad@pqm.canonical.com-20110920121315-wcv6kpxvpetjfaq8"
33 ], 33 ],
34 "loggerhead": [34 "loggerhead": [
35 456, 35 456,
3636
=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf 2011-09-15 11:22:48 +0000
+++ utilities/sourcedeps.conf 2011-09-20 23:52:17 +0000
@@ -1,10 +1,10 @@
1bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=681bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=68
2bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=2652bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=266
3bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=2913bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=291
4bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=504bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=50
5bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=27175bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2717
6cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=4326cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
7dulwich lp:~launchpad-pqm/dulwich/devel;revno=4307dulwich lp:~launchpad-pqm/dulwich/devel;revno=431
8difftacular lp:difftacular;revno=68difftacular lp:difftacular;revno=6
9loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=4569loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=456
10lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=2310lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23