Merge lp:~jameinel/bzr/2.0-string-exception-586926 into lp:bzr/2.0

[John A Meinel]

We accidentally have a string exception as pointed out by Barry Warsaw, as pointed out by the debian guys.

This should fix it, and should get merged up to bzr.dev.

[Barry Warsaw (barry)]

+1

review: Approve

=== modified file 'NEWS'
--- NEWS	2010-05-20 21:23:47 +0000
+++ NEWS	2010-05-28 18:08:30 +0000
@@ -26,6 +26,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'
--- bzrlib/bundle/bundle_data.py	2009-05-06 05:36:28 +0000
+++ bzrlib/bundle/bundle_data.py	2010-05-28 18:08:30 +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':