[MERGE] trivial fix 'bzr reconfigure'

[Rob Weir]

On Sat, Sep 22, 2007 at 01:38:18AM -0400, Jelmer Vernooij said
> Ok if the check can also make sure the right error message is printed.

Oops, sorry.  Updated bundle attached.

-rob
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: rweir at ertius.org-20070922060835-kg519btg6kiyuf4y
# target_branch: file:///home/rob/repositories/freesoftware/bazaar\
#   /mainline/
# testament_sha1: 90591ceb226b57bbae95a96043fc0865fc452962
# timestamp: 2007-09-22 17:17:47 +1000
# base_revision_id: pqm at pqm.ubuntu.com-20070921081743-jhdchcp1wiwmw0jv
# 
# Begin patch
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2007-09-17 12:46:56 +0000
+++ bzrlib/builtins.py	2007-09-22 00:40:44 +0000
@@ -4185,7 +4185,7 @@
     def run(self, location=None, target_type=None, bind_to=None, force=False):
         directory = bzrdir.BzrDir.open(location)
         if target_type is None:
-            raise BzrCommandError('No target configuration specified')
+            raise errors.BzrCommandError('No target configuration specified')
         elif target_type == 'branch':
             reconfiguration = reconfigure.Reconfigure.to_branch(directory)
         elif target_type == 'tree':

=== modified file 'bzrlib/tests/blackbox/test_reconfigure.py'
--- bzrlib/tests/blackbox/test_reconfigure.py	2007-09-17 12:45:54 +0000
+++ bzrlib/tests/blackbox/test_reconfigure.py	2007-09-22 06:08:35 +0000
@@ -56,3 +56,8 @@
         branch = self.make_branch('branch')
         checkout = branch.create_checkout('checkout', lightweight=True)
         self.run_bzr('reconfigure --checkout checkout')
+
+    def test_no_args(self):
+        branch = self.make_branch('branch')
+        self.run_bzr_error(['No target configuration specified'],
+                           'reconfigure', working_dir='branch')

# Begin bundle
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070922/8af4ee49/attachment.pgp