Rev 3974: (jam) Fix a small bug in knit.KnitVersionedFiles._check_should_delta in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3974
revision-id: pqm at pqm.ubuntu.com-20090130031028-y70uzzpad9c47v09
parent: pqm at pqm.ubuntu.com-20090129131703-lgus0aiclez3isj6
parent: john at arbash-meinel.com-20090129230103-do6e8kwjg8ns0oyp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-01-30 03:10:28 +0000
message:
  (jam) Fix a small bug in knit.KnitVersionedFiles._check_should_delta
modified:
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
    ------------------------------------------------------------
    revno: 3973.1.1
    revision-id: john at arbash-meinel.com-20090129230103-do6e8kwjg8ns0oyp
    parent: pqm at pqm.ubuntu.com-20090129131703-lgus0aiclez3isj6
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2009-01-29 17:01:03 -0600
    message:
      Trivially fix a bug in _check_should_delta when a parent is not present.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2009-01-22 21:32:15 +0000
+++ b/bzrlib/knit.py	2009-01-29 23:01:03 +0000
@@ -919,7 +919,7 @@
                 # boundaries.
                 build_details = self._index.get_build_details([parent])
                 parent_details = build_details[parent]
-            except RevisionNotPresent, KeyError:
+            except (RevisionNotPresent, KeyError), e:
                 # Some basis is not locally present: always fulltext
                 return False
             index_memo, compression_parent, _, _ = parent_details