[MERGE] trivial fix 'bzr reconfigure'

[Rob Weir]

Hi all,

I just noticed that 'bzr reconfigure' with no arguments throws an
exception.  The trivial fix is attached [0] and closes LP #141629.

-rob

0: or http://ertius.org/bzr/bazaar/bzr-reconfigure-with-no-args/

-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: rweir at ertius.org-20070922004044-0s4vv2q6e7bdovms
# target_branch: file:///home/rob/repositories/freesoftware/bazaar\
#   /mainline/
# testament_sha1: 0d89dbc4e1b957ec81f33ca70d9086de66b8d981
# timestamp: 2007-09-22 13:47:56 +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-21 23:48:16 +0000
@@ -56,3 +56,7 @@
         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('reconfigure', working_dir='branch')

# Begin bundle
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
W8n71vxui6LW61xm1L4P/C7kinChIPTzZ/A=
-------------- 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/e3326ca3/attachment-0001.pgp