Merge lp:~mascha/sbackup/fixFor632605 into lp:sbackup/0.11

Proposed by Martin Schaaf
Status: Merged
Approved by: Jean-Peer Lorenz
Approved revision: 189
Merged at revision: 197
Proposed branch: lp:~mascha/sbackup/fixFor632605
Merge into: lp:sbackup/0.11
Diff against target: 22 lines (+5/-1)
1 file modified
src/sbackup/ar_backend/tar.py (+5/-1)
To merge this branch: bzr merge lp:~mascha/sbackup/fixFor632605
Reviewer Review Type Date Requested Status
sbackup Developers Pending
Review via email: mp+34927@code.launchpad.net

Commit message

[Fix] LP #632605: Incremental backups fail but not full backups

To post a comment you must log in.
Revision history for this message
Martin Schaaf (mascha) wrote :

This patch leads to another error that says that str and Error object cannot be concatenated. The fix is to surround sys.exc_info()[1] with str().

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/sbackup/ar_backend/tar.py'
2--- src/sbackup/ar_backend/tar.py 2010-08-18 18:55:17 +0000
3+++ src/sbackup/ar_backend/tar.py 2010-09-08 21:55:57 +0000
4@@ -35,6 +35,7 @@
5 import tempfile
6 import shutil
7 import re
8+import sys
9
10 from datetime import datetime
11
12@@ -1037,7 +1038,10 @@
13 if c == '\0':
14 n += 1
15 header += c
16- fd.close()
17+ try:
18+ fd.close()
19+ except:
20+ LogFactory.getLogger().warn("error on closing the snarfile header after reading: " + sys.exc_info()[1])
21
22 return header
23

Subscribers

People subscribed via source and target branches