bzr-builddeb

Merge lp:~lifeless/bzr-builddeb/trunk into lp:bzr-builddeb

  1. trunk
  2. Merge into trunk
Proposed by Robert Collins
Status: Rejected
Rejected by: Robert Collins
Proposed branch: lp:~lifeless/bzr-builddeb/trunk
Merge into: lp:bzr-builddeb
Diff against target: 18 lines (+1/-1)
1 file modified
changes.py (+1/-1)
To merge this branch: bzr merge lp:~lifeless/bzr-builddeb/trunk
Reviewer Review Type Date Requested Status
James Westby Disapprove
Review via email: mp+23749@code.launchpad.net

Description of the change

This fixes a relative import which causes breaks testing looms.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Hi,

As discussed before this isn't appropriate.

There is no

  bzrlib.plugins.builddeb.commands

module, so this won't work.

It's the stdlib commands module that is being imported.

What does this break for you?

Thanks,

James

review: Disapprove
Revision history for this message
Robert Collins (lifeless) wrote :

Mea culpa, I forgot that that is a global module.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'changes.py'
2--- changes.py 2009-12-01 17:14:15 +0000
3+++ changes.py 2010-04-20 07:44:16 +0000
4@@ -18,13 +18,13 @@
5 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
6 #
7
8-import commands
9 import os
10
11 from debian_bundle import deb822
12
13 from bzrlib.trace import mutter
14
15+from bzrlib.plugins.builddeb import commands
16 from bzrlib.plugins.builddeb.errors import DebianError, MissingChanges
17
18 class DebianChanges(deb822.Changes):

Subscribers

People subscribed via source and target branches