Commit 37307976 authored by owsla's avatar owsla

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@859 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent 49870251
New in v1.1.15 (????/??/??) 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 Don't assume that a file cannot be read simply becasue of the access
permissions -- eg, NFS with (rw,all_squash) options. Closes Savannah permissions -- eg, NFS with (rw,all_squash) options. Closes Savannah
bug #21202. (Based on patch from Marc Horowitz) bug #21202. (Based on patch from Marc Horowitz)
......
...@@ -429,7 +429,7 @@ def backup_get_mirrortime(): ...@@ -429,7 +429,7 @@ def backup_get_mirrortime():
def backup_final_init(rpout): def backup_final_init(rpout):
"""Open the backup log and the error log, create increments dir""" """Open the backup log and the error log, create increments dir"""
global prevtime global prevtime, incdir
if Log.verbosity > 0: if Log.verbosity > 0:
Log.open_logfile(Globals.rbdir.append("backup.log")) Log.open_logfile(Globals.rbdir.append("backup.log"))
checkdest_if_necessary(rpout) checkdest_if_necessary(rpout)
...@@ -438,8 +438,7 @@ def backup_final_init(rpout): ...@@ -438,8 +438,7 @@ def backup_final_init(rpout):
"""Time of Last backup is not in the past. This is probably caused """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.""") by running two backups in less than a second. Wait a second a try again.""")
ErrorLog.open(Time.curtimestr, compress = Globals.compression) ErrorLog.open(Time.curtimestr, compress = Globals.compression)
inc_base = Globals.rbdir.append_path("increments") if not incdir.lstat(): incdir.mkdir()
if not inc_base.lstat(): inc_base.mkdir()
def backup_touch_curmirror_local(rpin, rpout): def backup_touch_curmirror_local(rpin, rpout):
"""Make a file like current_mirror.time.data to record time """Make a file like current_mirror.time.data to record time
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment