[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/Main.py

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/12/25 02:12:30

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : Main.py 

Log message:
        Fix bug where rdiff-backup fails after all increments are removed. 
Closes
        Savannah bug #20291.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.249&r2=1.250
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Main.py?cvsroot=rdiff-backup&r1=1.114&r2=1.115

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- CHANGELOG   24 Dec 2007 22:39:47 -0000      1.249
+++ CHANGELOG   25 Dec 2007 02:12:30 -0000      1.250
@@ -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)

Index: rdiff_backup/Main.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Main.py,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- rdiff_backup/Main.py        24 Dec 2007 22:39:47 -0000      1.114
+++ rdiff_backup/Main.py        25 Dec 2007 02:12:30 -0000      1.115
@@ -429,7 +429,7 @@
 
 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 @@
 """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