Merge lp:~vila/udd/819910-file-mp into lp:udd

[Vincent Ladeuil]

cough, it's a bit weird to propose a patch for a fix that is
currently in production (and not even committed... bad vila,
bad...).

Anyway, after digging a bit and adding a couple of mutter calls,
I realized we weren't using the right url to file the mp, when
presented with canonical urls (a la
https://api.launchpad.net/1.0/... lp.branches.getByUrl was just
returning None).

The history is unclear here and I suspect that on top lp uris
changes poolie already addressed, something may also have changed
server-side.

But since those urls are not recognized, then... let's use the
regular ones ;)

The fix is therefore trivial and fixed 23 failures.

[Martin Pool (mbp)]

thanks for fixing that.

- url=target_branch_url)
+ url=target_branch_url)

i think pep8 allows both, but I prefer just four-char indents for continuations.

review: Approve

=== modified file 'import_package.py'
--- import_package.py	2011-08-31 15:23:33 +0000
+++ import_package.py	2011-09-02 23:45:23 +0000
@@ -502,9 +502,9 @@
 def file_mp(distro, release, pocket, name, bstore, lp_side_branch_path):
     lp_branch = lpapi.lp_call(lp.branches.getByUrl,
         url=lp_side_branch_path)
-    target_branch_url = bstore._branch_url(distro, release, pocket)
+    target_branch_url = bstore._branch_location(distro, release, pocket)[0]
     target_lp_branch = lpapi.lp_call(lp.branches.getByUrl,
-        url=target_branch_url)
+                                     url=target_branch_url)
     # It would be great to notify the uploader and pusher of the merge
     # proposal, but let's start with ~ubuntu-dev.
     ubuntu_dev = lpapi.lp_call(operator.getitem, lp.people, 'ubuntu-dev')