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

[Robert Collins]

This fixes a relative import which causes breaks testing looms.

[James Westby (james-w)]

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

[Robert Collins (lifeless)]

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

Unmerged revisions

=== modified file 'changes.py'
--- changes.py	2009-12-01 17:14:15 +0000
+++ changes.py	2010-04-20 07:44:16 +0000
@@ -18,13 +18,13 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-import commands
 import os
 
 from debian_bundle import deb822
 
 from bzrlib.trace import mutter
 
+from bzrlib.plugins.builddeb import commands
 from bzrlib.plugins.builddeb.errors import DebianError, MissingChanges
 
 class DebianChanges(deb822.Changes):