← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store.py

Nathaniel McCallums patch for urandom friendliness on aix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store.py
126
126
        pb.update('preparing to copy')
127
127
        to_copy = [id for id in ids if id not in self]
128
128
        if isinstance(other, ImmutableStore):
129
 
            return self.copy_multi_immutable(other, to_copy, pb, 
130
 
                                             permit_failure=permit_failure)
 
129
            return self.copy_multi_immutable(other, to_copy, pb)
131
130
        count = 0
132
131
        failed = set()
133
132
        for id in to_copy:
138
137
            else:
139
138
                try:
140
139
                    entry = other[id]
141
 
                except KeyError:
 
140
                except IndexError:
142
141
                    failed.add(id)
143
142
                    continue
144
143
                self.add(entry, id)
214
213
            if e.errno != errno.ENOENT:
215
214
                raise
216
215
 
217
 
        raise KeyError(fileid)
 
216
        raise IndexError(fileid)
218
217
 
219
218
 
220
219
    def total_size(self):