Merge lp:~laney/friends/sync-archive-gir into lp:friends

Proposed by Iain Lane on 2014-05-22
Status: Merged
Merged at revision: 255
Proposed branch: lp:~laney/friends/sync-archive-gir
Merge into: lp:friends
Diff against target: 53 lines (+14/-3)
3 files modified
debian/changelog (+11/-0)
debian/control (+2/-2)
friends/utils/http.py (+1/-1)
To merge this branch: bzr merge lp:~laney/friends/sync-archive-gir
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-05-22
Super Friends 2014-05-22 Pending
Review via email: mp+220625@code.launchpad.net

Commit message

Adapt to changes in libsoup's gi bindings

Description of the change

I uploaded this as the autopkgtest was failing and blocking stuff (so you can manually merge this branch, no need to train it)

https://git.gnome.org/browse/libsoup/commit/?id=0f22a7505ae2e41e2a9e17854d9bd362f5a72945 changed the gi annotations to enable the length to be inferred and require the data to be in bytes.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/friends-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-utopic-amd64-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/friends-ci/58/rebuild

review: Approve (continuous-integration)
Robert Bruce Park (robru) wrote :

Thanks laney!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-02-17 17:38:56 +0000
3+++ debian/changelog 2014-05-22 11:58:32 +0000
4@@ -1,3 +1,14 @@
5+friends (0.2.0+14.04.20140217.1-0ubuntu2) utopic; urgency=medium
6+
7+ * friends/utils/http.py: Fix some incompatibilities introduced because
8+ libsoup 2.46.0 made its gi bindings smarter in an incompatible way.
9+ + The length parameter is now calculated from the list, don't pass it
10+ explicitly.
11+ + The list needs to be bytes, not a string.
12+ * Increase deps to ensure we have the new version.
13+
14+ -- Iain Lane <iain.lane@canonical.com> Thu, 22 May 2014 11:18:04 +0100
15+
16 friends (0.2.0+14.04.20140217.1-0ubuntu1) trusty; urgency=low
17
18 [ Scott Sweeny ]
19
20=== modified file 'debian/control'
21--- debian/control 2013-11-07 14:54:31 +0000
22+++ debian/control 2014-05-22 11:58:32 +0000
23@@ -16,7 +16,7 @@
24 gir1.2-networkmanager-1.0,
25 gir1.2-notify-0.7,
26 gir1.2-signon-1.0,
27- gir1.2-soup-2.4,
28+ gir1.2-soup-2.4 (>= 2.46.0),
29 gir1.2-unity-5.0,
30 libaccounts-glib-dev (>= 1.10),
31 libsignon-glib1,
32@@ -62,7 +62,7 @@
33 gir1.2-networkmanager-1.0,
34 gir1.2-notify-0.7,
35 gir1.2-signon-1.0,
36- gir1.2-soup-2.4,
37+ gir1.2-soup-2.4 (>= 2.46.0),
38 gir1.2-accounts-1.0,
39 python3-pkg-resources,
40 python3-dbus,
41
42=== modified file 'friends/utils/http.py'
43--- friends/utils/http.py 2013-02-19 17:00:41 +0000
44+++ friends/utils/http.py 2014-05-22 11:58:32 +0000
45@@ -181,7 +181,7 @@
46 if data is not None:
47 message.set_request(
48 'application/x-www-form-urlencoded; charset=utf-8',
49- Soup.MemoryUse.COPY, data, len(data))
50+ Soup.MemoryUse.COPY, data.encode())
51
52 # Possibly do some rate limiting.
53 self._rate_limiter.wait(message)

Subscribers

People subscribed via source and target branches

to all changes: