Rev 2987: fix formatting of ImmortalPendingDeletion error message. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2987
revision-id: pqm at pqm.ubuntu.com-20071113231602-qy0rskctbikrs59x
parent: pqm at pqm.ubuntu.com-20071113222657-2x5wq0rwwrb7rv2y
parent: bialix at ukr.net-20071113212646-7ig0xufvw7dkq0w8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-11-13 23:16:02 +0000
message:
  fix formatting of ImmortalPendingDeletion error message.
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
    ------------------------------------------------------------
    revno: 2978.2.2
    merged: bialix at ukr.net-20071113212646-7ig0xufvw7dkq0w8
    parent: bialix at ukr.net-20071113210126-t2ptcdd0fmi23vfq
    parent: pqm at pqm.ubuntu.com-20071113183931-av8ih92ad65slodl
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: unprintable.exception
    timestamp: Tue 2007-11-13 23:26:46 +0200
    message:
      merge bzr.dev
    ------------------------------------------------------------
    revno: 2978.2.1
    merged: bialix at ukr.net-20071113210126-t2ptcdd0fmi23vfq
    parent: pqm at pqm.ubuntu.com-20071109195036-5o5bwu0a01uniqwg
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: unprintable.exception
    timestamp: Tue 2007-11-13 23:01:26 +0200
    message:
      fix formatting of ImmortalPendingDeletion error message.
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2007-11-13 02:09:03 +0000
+++ b/bzrlib/errors.py	2007-11-13 21:26:46 +0000
@@ -1898,9 +1898,9 @@
 
 class ImmortalPendingDeletion(BzrError):
 
-    _fmt = """Unable to delete transform temporary directory
-    %(pending_deletion)s.  Please examine %(pending_deletions)s to see if it
-    contains any files you wish to keep, and delete it when you are done."""
+    _fmt = ("Unable to delete transform temporary directory "
+    "%(pending_deletion)s.  Please examine %(pending_deletion)s to see if it "
+    "contains any files you wish to keep, and delete it when you are done.")
 
     def __init__(self, pending_deletion):
        BzrError.__init__(self, pending_deletion=pending_deletion)

=== modified file 'bzrlib/tests/test_errors.py'
--- a/bzrlib/tests/test_errors.py	2007-10-12 05:26:46 +0000
+++ b/bzrlib/tests/test_errors.py	2007-11-13 21:01:26 +0000
@@ -382,6 +382,14 @@
         self.assertEqual(
             "Corrupt or incompatible data stream: my reason", str(e))
 
+    def test_immortal_pending_deletion_message(self):
+        err = errors.ImmortalPendingDeletion('foo')
+        self.assertEquals(
+            "Unable to delete transform temporary directory foo.  "
+            "Please examine foo to see if it contains any files "
+            "you wish to keep, and delete it when you are done.",
+            str(err))
+
 
 class PassThroughError(errors.BzrError):