| 1 | 141c141 |
|---|
| 2 | < def abort(self): |
|---|
| 3 | --- |
|---|
| 4 | > def abort(self, sharenums=None): |
|---|
| 5 | 147c147,153 |
|---|
| 6 | < for writer in self.buckets.itervalues(): writer.abort() |
|---|
| 7 | --- |
|---|
| 8 | > if not sharenums: |
|---|
| 9 | > sharenums = self.buckets.keys() |
|---|
| 10 | > |
|---|
| 11 | > for sharenum in sharenums: |
|---|
| 12 | > if sharenum in self.buckets: |
|---|
| 13 | > self.buckets[sharenum].abort() |
|---|
| 14 | > del self.buckets[sharenum] |
|---|
| 15 | 361a368,369 |
|---|
| 16 | > for writer in self.use_peers: |
|---|
| 17 | > writer.abort(self.homeless_shares) |
|---|
| 18 | 370,371c378,379 |
|---|
| 19 | < raise UploadUnhappinessError("%s (%s)" % (msg, |
|---|
| 20 | < self._get_progress_message())) |
|---|
| 21 | --- |
|---|
| 22 | > log.msg("server selection unsuccessful for %s: %s: %s: %s" % (self, msg, self._get_progress_message(), pretty_print_shnum_to_servers(merged))) |
|---|
| 23 | > return self._failed("%s (%s)" % (msg, self._get_progress_message())) |
|---|
