Rev 4847: Merge 2.0 in 2.1 including fix for bug #586926 in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.1/

------------------------------------------------------------
revno: 4847 [merge]
revision-id: pqm at pqm.ubuntu.com-20100616143824-gf3fau7lsk1st9zp
parent: pqm at pqm.ubuntu.com-20100527195811-iuxqt412tjq9ldio
parent: v.ladeuil+lp at free.fr-20100616121256-0c4382ens3fxew4u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Wed 2010-06-16 15:38:24 +0100
message:
  Merge 2.0 in 2.1 including fix for bug #586926
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
=== modified file 'NEWS'
--- a/NEWS	2010-05-27 18:18:39 +0000
+++ b/NEWS	2010-06-16 12:12:56 +0000
@@ -20,6 +20,9 @@
 Bug Fixes
 *********
 
+* Raise ValueError instead of a string exception.
+  (John Arbash Meinel, #586926)
+
 Improvements
 ************
 
@@ -499,6 +502,9 @@
   permissions as ``.bzr`` directory on a POSIX OS.
   (Parth Malwankar, #262450)
 
+* Raise ValueError instead of a string exception.
+  (John Arbash Meinel, #586926)
+
 * Reduce peak memory by one copy of compressed text.
   (John Arbash Meinel, #566940)
 

=== modified file 'bzrlib/bundle/bundle_data.py'
--- a/bzrlib/bundle/bundle_data.py	2009-05-06 05:36:28 +0000
+++ b/bzrlib/bundle/bundle_data.py	2010-05-28 17:59:55 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -327,7 +327,7 @@
                 try:
                     name, value = info_item.split(':', 1)
                 except ValueError:
-                    raise 'Value %r has no colon' % info_item
+                    raise ValueError('Value %r has no colon' % info_item)
                 if name == 'last-changed':
                     last_changed = value
                 elif name == 'executable':