Merge lp://qastaging/~ursinha/landscape-charm/collect-logs-ignore-file-changed into lp://qastaging/~landscape/landscape-charm/tools
| Status: | Merged |
|---|---|
| Approved by: | Ursula Junque |
| Approved revision: | 29 |
| Merged at revision: | 30 |
| Proposed branch: | lp://qastaging/~ursinha/landscape-charm/collect-logs-ignore-file-changed |
| Merge into: | lp://qastaging/~landscape/landscape-charm/tools |
| Diff against target: |
52 lines (+10/-7) 2 files modified
collect-logs (+8/-5) test_collect-logs.py (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~ursinha/landscape-charm/collect-logs-ignore-file-changed |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andreas Hasenack | Approve | ||
|
Review via email:
|
|||
Commit message
Fixes bug 1623678, by re-adding the mechanism to ignore when tar returns 1 because files changed while tarfile is being created.
Description of the change
This branch fixes bug 1623678, by re-adding the mechanism to ignore when tar returns 1 because files changed while tarfile is being created.
I've done two things:
- Removed the tar --warning=
- Added mechanism to check if tar failure was due to files changing and deliberately proceed, ignoring this error in particular.
These two together restore previous and expected behavior.
+1!