[Pkg-bazaar-commits] ./bzr/unstable r395: - fix error raised from invalid InventoryEntry name

[Martin Pool]

------------------------------------------------------------
revno: 395
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-05-09 09:11:45 +1000
message:
  - fix error raised from invalid InventoryEntry name
modified:
  TODO
  bzrlib/inventory.py
-------------- next part --------------
=== modified file 'TODO'
--- a/TODO	2005-05-08 03:33:57 +0000
+++ b/TODO	2005-05-08 23:11:45 +0000
@@ -88,7 +88,7 @@
   temporary directory and then tar that up.)
 
   http://www.gelato.unsw.edu.au/archives/git/0504/2194.html
-
+  
 * testbzr should by default test the bzr binary in the same directory
   as the testbzr script, or take a path to it as a first parameter.
 

=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py	2005-05-05 09:49:08 +0000
+++ b/bzrlib/inventory.py	2005-05-08 23:11:45 +0000
@@ -29,7 +29,7 @@
     from elementtree.ElementTree import Element, ElementTree, SubElement
 
 from xml import XMLMixin
-from errors import bailout, BzrError
+from errors import bailout, BzrError, BzrCheckError
 
 import bzrlib
 from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath
@@ -115,7 +115,7 @@
         '123'
         >>> e = InventoryEntry('123', 'src/hello.c', 'file', ROOT_ID)
         Traceback (most recent call last):
-        BzrError: ("InventoryEntry name is not a simple filename: 'src/hello.c'", [])
+        BzrCheckError: InventoryEntry name 'src/hello.c' is invalid
         """
         if '/' in name or '\\' in name:
             raise BzrCheckError('InventoryEntry name %r is invalid' % name)