diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-12-25 02:12:30 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-12-25 02:12:30 +0000 |
| commit | 82eebfb36d649dc0abdc09952f24af14e162e976 (patch) | |
| tree | e60e7a17fd15af40128a5115a568952ef7024857 | |
| parent | 95b1b6b1bbf98f10bb86d5e7880683b27aaddfcd (diff) | |
| download | rdiff-backup-82eebfb36d649dc0abdc09952f24af14e162e976.tar.gz | |
Fix bug where rdiff-backup fails after all increments are removed. Closes
Savannah bug #20291.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@859 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 3 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/Main.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index bf1b11a..fbc6afc 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,9 @@ New in v1.1.15 (????/??/??) --------------------------- +Fix bug where rdiff-backup fails after all increments are removed. Closes +Savannah bug #20291. (Andrew Ferguson) + Don't assume that a file cannot be read simply becasue of the access permissions -- eg, NFS with (rw,all_squash) options. Closes Savannah bug #21202. (Based on patch from Marc Horowitz) diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py index 155cd90..a7fe220 100644 --- a/rdiff-backup/rdiff_backup/Main.py +++ b/rdiff-backup/rdiff_backup/Main.py @@ -429,7 +429,7 @@ def backup_get_mirrortime(): def backup_final_init(rpout): """Open the backup log and the error log, create increments dir""" - global prevtime + global prevtime, incdir if Log.verbosity > 0: Log.open_logfile(Globals.rbdir.append("backup.log")) checkdest_if_necessary(rpout) @@ -438,8 +438,7 @@ def backup_final_init(rpout): """Time of Last backup is not in the past. This is probably caused by running two backups in less than a second. Wait a second a try again.""") ErrorLog.open(Time.curtimestr, compress = Globals.compression) - inc_base = Globals.rbdir.append_path("increments") - if not inc_base.lstat(): inc_base.mkdir() + if not incdir.lstat(): incdir.mkdir() def backup_touch_curmirror_local(rpin, rpout): """Make a file like current_mirror.time.data to record time |