Back In Time

Merge lp:~bratdaking/backintime/bug-474307 into lp:backintime/1.0

  1. bug-474307
  2. Merge into release-1.0
Proposed by Bart de Koning
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bratdaking/backintime/bug-474307
Merge into: lp:backintime/1.0
Diff against target: 33 lines (+3/-3)
2 files modified
CHANGES (+1/-1)
common/snapshots.py (+2/-2)
To merge this branch: bzr merge lp:~bratdaking/backintime/bug-474307
Reviewer Review Type Date Requested Status
Back In Time Team Pending
Review via email: mp+14539@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Bart de Koning (bratdaking) wrote :

This branch adds the -H option to all the rsync commands. It will maintain also hardlinks within snapshots and during recovery again.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CHANGES'
2--- CHANGES 2009-10-18 15:53:45 +0000
3+++ CHANGES 2009-11-06 10:40:24 +0000
4@@ -14,7 +14,7 @@
5 * fix opening german files with external applications in KDE (LP: #404652)
6 * changed default exclude patterns to caches, thumbnails, trashbins, and backups (LP: #422132)
7 * write access to snapshot folder is checked & change to snapshot version 2 (LP: #423086)
8-* fix small bugs
9+* fix small bugs (a.o. LP: #474307)
10 * Fix bug in schedule per included folder (LP: #412470)
11 * Used a more standard crontab syntax (LP: #409783)
12 * Stop the "Over zealous removal of crontab entries" (LP: #451811)
13
14=== modified file 'common/snapshots.py'
15--- common/snapshots.py 2009-11-02 13:52:00 +0000
16+++ common/snapshots.py 2009-11-06 10:40:25 +0000
17@@ -257,7 +257,7 @@
18
19 backup_suffix = '.backup.' + datetime.date.today().strftime( '%Y%m%d' )
20 #cmd = "rsync -avR --copy-unsafe-links --whole-file --backup --suffix=%s --chmod=+w %s/.%s %s" % ( backup_suffix, self.get_snapshot_path_to( snapshot_id ), path, '/' )
21- cmd = "rsync -avRAXE --whole-file --backup --suffix=%s " % backup_suffix
22+ cmd = "rsync -avRAXEH --whole-file --backup --suffix=%s " % backup_suffix
23 cmd = cmd + '--chmod=+w '
24 cmd = cmd + "\"%s.%s\" %s" % ( self.get_snapshot_path_to( snapshot_id ), path, '/' )
25 self._execute( cmd )
26@@ -617,7 +617,7 @@
27 rsync_include2 = ' '.join( items2 )
28
29 #rsync prefix & suffix
30- rsync_prefix = 'rsync -aEAX '
31+ rsync_prefix = 'rsync -aEAXH '
32 rsync_exclude_backup_directory = " --exclude=\"%s\" --exclude=\"%s\" " % ( self.config.get_snapshots_path(), self.config._LOCAL_DATA_FOLDER )
33 rsync_suffix = ' --chmod=Fa-w,Da-w --whole-file --delete ' + rsync_exclude_backup_directory + rsync_include + ' ' + rsync_exclude + ' ' + rsync_include2 + ' --exclude=\"*\" / '
34

Subscribers

People subscribed via source and target branches