Breezy

Merge lp:~jelmer/brz/some-win-fixes into lp:brz/3.2

  1. some-win-fixes
  2. Merge into 3.2
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/some-win-fixes
Merge into: lp:brz/3.2
Diff against target: 24 lines (+2/-1)
2 files modified
breezy/osutils.py (+1/-1)
breezy/tests/test_server.py (+1/-0)
To merge this branch: bzr merge lp:~jelmer/brz/some-win-fixes
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+413476@code.launchpad.net

Commit message

Two small error handling fixes for windows. (Aleksandr Smyshliaev)

Description of the change

Two small error handling fixes for windows.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/osutils.py'
2--- breezy/osutils.py 2021-12-08 18:46:11 +0000
3+++ breezy/osutils.py 2021-12-24 15:18:31 +0000
4@@ -468,7 +468,7 @@
5 Helps to remove files and dirs marked as read-only.
6 """
7 exception = excinfo[1]
8- if function in (os.remove, os.rmdir) \
9+ if function in (os.unlink, os.remove, os.rmdir) \
10 and isinstance(exception, OSError) \
11 and exception.errno == errno.EACCES:
12 make_writable(path)
13
14=== modified file 'breezy/tests/test_server.py'
15--- breezy/tests/test_server.py 2020-06-10 23:47:24 +0000
16+++ breezy/tests/test_server.py 2021-12-24 15:18:31 +0000
17@@ -350,6 +350,7 @@
18 accepted_errnos = [errno.EBADF,
19 errno.EPIPE,
20 errno.WSAEBADF,
21+ errno.WSAENOTSOCK,
22 errno.WSAECONNRESET,
23 errno.WSAENOTCONN,
24 errno.WSAESHUTDOWN,

Subscribers

People subscribed via source and target branches