/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/weavefile.py

  • Committer: Daniel Knittl-Frank
  • Date: 2010-09-14 13:12:20 UTC
  • mto: This revision was merged to the branch mainline in revision 5427.
  • Revision ID: knittl89+bzr@googlemail.com-20100914131220-rzphka9ajmmnciri
 Do not descend directories in CommonInventory.entries() when root is None
    
 This was the case at least for `bzr inventory -r0`.
 Simply check if self.root is not Null before descending

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
118
118
 
119
119
    from weave import WeaveFormatError
120
120
 
121
 
    lines = iter(f.readlines())
 
121
    try:
 
122
        lines = iter(f.readlines())
 
123
    finally:
 
124
        f.close()
122
125
 
123
126
    try:
124
127
        l = lines.next()