Rev 5095: (mbp) NameError raising error in ReadVFile.readline() in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5095 [merge]
revision-id: pqm at pqm.ubuntu.com-20100318065553-0rmuklt8qff3629j
parent: pqm at pqm.ubuntu.com-20100318011517-fx3cmbtk9p0bdlp8
parent: mbp at canonical.com-20100315065444-gfs7vp8te4ez5rc9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-03-18 06:55:53 +0000
message:
  (mbp) NameError raising error in ReadVFile.readline()
modified:
  bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
=== modified file 'bzrlib/pack.py'
--- a/bzrlib/pack.py	2009-07-02 03:48:25 +0000
+++ b/bzrlib/pack.py	2010-03-15 06:54:44 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2009 Canonical Ltd
+# Copyright (C) 2007, 2009, 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
@@ -203,7 +203,7 @@
         result = self._string.readline()
         if self._string.tell() == self._string_length and result[-1] != '\n':
             raise errors.BzrError('short readline in the readvfile hunk: %r'
-                % (readline, ))
+                % (result, ))
         return result