Merge lp://staging/~jamesodhunt/ubiquity/bug-944191 into lp://staging/ubiquity
Proposed by
James Hunt
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 5285 | ||||
| Proposed branch: | lp://staging/~jamesodhunt/ubiquity/bug-944191 | ||||
| Merge into: | lp://staging/ubiquity | ||||
| Diff against target: |
52 lines (+20/-2) (has conflicts) 2 files modified
debian/changelog (+10/-1) scripts/install.py (+10/-1) Text conflict in debian/changelog |
||||
| To merge this branch: | bzr merge lp://staging/~jamesodhunt/ubiquity/bug-944191 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stéphane Graber (community) | Approve | ||
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-03-20.
Description of the change
* scripts/install.py: Ignore mkdir failure if directory does (now)
exist to accommodate update-apt-cache running in parallel with
copy_all() (LP: #944191).
(Updated with Colins feedback).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The style in ubiquity is to check specifically for OSError, rather than for the more general EnvironmentError. Doing so is safe in this case; you aren't going to get anything else from os.mkdir.
I don't think you need to recheck os.path.isdir; simply having got EEXIST from os.mkdir implies that. I would just write this as 'if e.errno != errno.EEXIST'.