Merge lp:~mbp/bzr/843900-url-nameerror into lp:bzr

[Martin Pool]

error message without traceback on invalid ubuntu/debian url (bug 843900)

Fix up a fairly obvious NameError to fail cleanly.

We could do more to help people guess what they _should_ be saying instead, but later.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10/6/2011 8:57 AM, Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/843900-url-nameerror
> into lp:bzr.
>
> Requested reviews: bzr-core (bzr-core) Related bugs: Bug #843900 in
> Bazaar: "NameError: global name 'result' is not defined"
> https://bugs.launchpad.net/bzr/+bug/843900
>
> For more details, see:
> https://code.launchpad.net/~mbp/bzr/843900-url-nameerror/+merge/78356
>
> Fix up a fairly obvious NameError to fail cleanly.
>
> We could do more to help people guess what they _should_ be saying
> instead, but later.

 merge: approve

Should we be backporting this?

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk6NX98ACgkQJdeBCYSNAAMIRACgsRivrMPNncl4RcVGeKBc7n7F
TgwAoIUg7UpOGlIUHuYE2PnMgAzid/7L
=WeHj
-----END PGP SIGNATURE-----

review: Approve

[Martin Pool (mbp)]

No backport, I think - it's just better reporting of a user error.

[Martin Pool (mbp)]

sent to pqm by email

=== modified file 'bzrlib/plugins/launchpad/lp_directory.py'
--- bzrlib/plugins/launchpad/lp_directory.py	2011-09-20 14:11:27 +0000
+++ bzrlib/plugins/launchpad/lp_directory.py	2011-10-06 06:56:22 +0000
@@ -131,7 +131,7 @@
             else:
                 # There are either 0 or > 2 path parts, neither of which is
                 # supported for these schemes.
-                raise errors.InvalidURL('Bad path: %s' % result.path)
+                raise errors.InvalidURL('Bad path: %s' % url)
             # Expand any series shortcuts, but keep unknown series.
             series = distro_series.get(series, series)
             # Hack the url and let the following do the final resolution.

=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- bzrlib/plugins/launchpad/test_lp_directory.py	2011-07-11 07:02:20 +0000
+++ bzrlib/plugins/launchpad/test_lp_directory.py	2011-10-06 06:56:22 +0000
@@ -121,6 +121,17 @@
         self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/ubuntu',
                            'lp:ubuntu')
 
+    def test_ubuntu_invalid(self):
+        """Invalid ubuntu urls don't crash.
+
+        :seealso: http://pad.lv/843900
+        """
+        # This ought to be natty-updates.
+        self.assertRaises(errors.InvalidURL,
+            self.assertResolve,
+            '',
+            'ubuntu:natty/updates/smartpm')
+
     def test_ubuntu_apt(self):
         self.assertResolve('bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/apt',
                            'lp:ubuntu/apt')