Merge lp://staging/~brendan-donegan/qakit/fix_path_name_log_upload into lp://staging/qakit
Proposed by
Brendan Donegan
| Status: | Merged |
|---|---|
| Merged at revision: | 9 |
| Proposed branch: | lp://staging/~brendan-donegan/qakit/fix_path_name_log_upload |
| Merge into: | lp://staging/qakit |
| Diff against target: |
48 lines (+11/-7) 2 files modified
qakit/practitest/practisubunit.py (+8/-6) qakit/practitest/practitest.py (+3/-1) |
| To merge this branch: | bzr merge lp://staging/~brendan-donegan/qakit/fix_path_name_log_upload |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Allan LeSage (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Not sure why I didn't hit it in my initial testing but there is a problem with log files which have a path as a name being uploaded, e.g. /var/log/syslog. I tweaked the code so that it takes the name of the file to upload as one part of a tuple and the temp file as the other and only uses the base name of the file for naming the tempfile - so /var/log/syslog would be stored in /tmp/tmp123xyz/
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
LGTM.