Bazaar

Merge lp:~jelmer/bzr/no-string-exc into lp:bzr

  1. no-string-exc
  2. Merge into bzr.dev
Proposed by Jelmer Vernooij
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: 5289
Proposed branch: lp:~jelmer/bzr/no-string-exc
Merge into: lp:bzr
Diff against target: 12 lines (+1/-1)
1 file modified
bzrlib/bundle/bundle_data.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/bzr/no-string-exc
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+27211@code.launchpad.net

Description of the change

This removes the use of a string exception.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

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

Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr/no-string-exc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
>
> This removes the use of a string exception.
>

 merge: approve

I thought we did this recently, did it not get propagated up from the
2.0/2.1 branch?

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

iEYEARECAAYFAkwQIuoACgkQJdeBCYSNAAPmFgCgryE+Wh5ziY3VymJQRbMjK2vt
rAsAnjCCNRRSyvrI9Cl5qkFvNeC0MEdI
=c6sT
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bzrlib/bundle/bundle_data.py'
--- bzrlib/bundle/bundle_data.py 2009-09-20 22:12:36 +0000
+++ bzrlib/bundle/bundle_data.py 2010-06-09 22:52:26 +0000
@@ -331,7 +331,7 @@
331 try:331 try:
332 name, value = info_item.split(':', 1)332 name, value = info_item.split(':', 1)
333 except ValueError:333 except ValueError:
334 raise 'Value %r has no colon' % info_item334 raise ValueError('Value %r has no colon' % info_item)
335 if name == 'last-changed':335 if name == 'last-changed':
336 last_changed = value336 last_changed = value
337 elif name == 'executable':337 elif name == 'executable':