Merge lp:~maxb/lpreview-body/fix-package into lp:~launchpad-committers/lpreview-body/packaging

[Max Bowsher]

[r=allenap][bug=766149] New upstream snapshot (Use lazy hook installation with bzr >= 2.4; Correct regexp used for getting revno currently on edge); Add missing XB-Python-Version field to control, fixing incorrect installation path of the Python files.

Fix the package, which is currently totally broken due to installing the Python files in the incorrect directory.

Then, pull in a couple of upstream changes whilst we're rebuilding it anyway.

[Gavin Panella (allenap)]

I know almost nothing about the dirty work involved in packaging, but
a search led me to the following:

  The use of XB-Python-Version in the binary package paragraphs of
  debian/control file has been deprecated and should be removed in the
  normal course of package updates. It never achieved sufficient
  deployment to support it's intended purpose of managing Python
  transitions. This can be adequately accomplished by examining
  package dependencies.

  http://www.debian.org/doc/packaging-manuals/python-policy/ch-module_packages.html

Should you instead be using X-Python-Version?

review: Needs Information

[Max Bowsher (maxb)]

> The use of XB-Python-Version in the binary package paragraphs of
> debian/control file has been deprecated
...
> Should you instead be using X-Python-Version?

If we were targetting Debian sid or Ubuntu natty, then yes. However this packaging is specifically using forms that are now considered deprecated in order to target Ubuntu >= lucid.

[Gavin Panella (allenap)]

Thanks for the explanation.

review: Approve

[Gavin Panella (allenap)]

Do you need someone to land this for you?

[Max Bowsher (maxb)]

> Do you need someone to land this for you?

Currently yes, though Robert implied I could be given write access to the branch in bug 766149.

[Gavin Panella (allenap)]

Okay, set a commit message and I'll send it off.

[Gavin Panella (allenap)]

Max, I had to squish the commit message because PQM, bless its cotton socks, can't deal with more than a single line at a time.

[Max Bowsher (maxb)]

PQM hasn't been used on this branch before, and I now have commit access. Can you see any reason why I shouldn't just push these revisions at the branch directly?

[Gavin Panella (allenap)]

No, just land it then. Sorry for the bother!

=== modified file '__init__.py'
--- __init__.py	2010-08-04 10:58:33 +0000
+++ __init__.py	2011-04-26 22:01:28 +0000
@@ -16,8 +16,7 @@
 
 """Provide review message bodies for proposed merges to Launchpad itself."""
 
-from bzrlib import commands, merge_directive
-
+from bzrlib import commands
 
 def shim(params):
     from body_callback import body_callback
@@ -31,25 +30,37 @@
                     hook_params['old_body'])
 
 
-if getattr(merge_directive.MergeDirective, 'hooks', None) is not None:
-    merge_directive.MergeDirective.hooks.install_named_hook(
-        'merge_request_body',
-        shim, 'Generate a message body for Launchpad merge requests.'
-    )
 try:
-    from bzrlib.plugins.launchpad import lp_propose
-except ImportError:
-    pass
+    from bzrlib.hooks import install_lazy_named_hook
+except ImportError: # bzr < 2.4
+    from bzrlib import merge_directive
+    if getattr(merge_directive.MergeDirective, 'hooks', None) is not None:
+        merge_directive.MergeDirective.hooks.install_named_hook(
+            'merge_request_body',
+            shim, 'Generate a message body for Launchpad merge requests.'
+        )
+    try:
+        from bzrlib.plugins.launchpad import lp_propose
+    except ImportError:
+        pass
+    else:
+        lp_propose.Proposer.hooks.install_named_hook(
+                'merge_proposal_body',
+                proposer_callback,
+                'Generate a message body for Launchpad merge requests.'
+            )
 else:
-    lp_propose.Proposer.hooks.install_named_hook(
-            'merge_proposal_body',
-            proposer_callback,
-            'Generate a message body for Launchpad merge requests.'
-        )
+    install_lazy_named_hook(
+        "bzrlib.merge_directive", "MergeDirective.hooks",
+        'merge_request_body',
+        shim, 'Generate a message body for Launchpad merge requests.')
+    install_lazy_named_hook(
+       "bzrlib.plugins.launcjpad.lp_propose", "Proposer.hooks",
+        'merge_proposal_body', proposer_callback,
+        'Generate a message body for Launchpad merge requests.')
 
 
 commands.plugin_cmds.register_lazy(
     'cmd_qa_ready', [], 'bzrlib.plugins.lpreview_body.qa_ready')
-
 commands.plugin_cmds.register_lazy(
     'cmd_lp_link_bug', [], 'bzrlib.plugins.lpreview_body.link_bug')
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-08-05 09:06:04 +0000
+++ debian/changelog	2011-04-26 22:01:28 +0000
@@ -1,3 +1,13 @@
+bzr-lpreview-body (0.1~bzr22-0launchpad1) lucid; urgency=low
+
+  * Add missing XB-Python-Version field to control, fixing incorrect
+    installation path of the Python files. (LP: #766149)
+  * New upstream snapshot:
+    - Use lazy hook installation with bzr >= 2.4.
+    - Correct regexp used for getting revno currently on edge.
+
+ -- Max Bowsher <[e-mail]>  Tue, 26 Apr 2011 22:53:48 +0100
+
 bzr-lpreview-body (0.1~bzr20-0ubuntu1~launchpad1) lucid; urgency=low
 
   * Initial release.
 
=== modified file 'debian/control'
--- debian/control	2010-08-04 11:03:39 +0000
+++ debian/control	2011-04-26 22:01:28 +0000
@@ -10,6 +10,7 @@
 Package: bzr-lpreview-body
 Architecture: all
 Depends: bzr, ${misc:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Bazaar plugin to provide review message bodies for Launchpad
  This Bazaar plugin generates a standard template for the message body, with
  lint output at the bottom.
 
=== modified file 'qa_ready.py'
--- qa_ready.py	2010-04-21 22:53:07 +0000
+++ qa_ready.py	2011-04-26 22:01:28 +0000
@@ -32,7 +32,7 @@
     """
     t = get_transport('https://edge.launchpad.net/')
     html = t.get_bytes('index.html')
-    revision_re = re.compile(r'\(r(\d+)\)')
+    revision_re = re.compile(r' +r(\d+)')
     for line in html.splitlines():
         matches = revision_re.search(line)
         if matches: