Hi, On Thu, 18 Sep 2014 15:12:39 +0100 Matthew Vernon <matthew@debian.org> wrote: > It's Ben Harris' patch, not mine, but yes, I hope to upload a fixed > version. Don't let me stop you doing so sooner, though :-) As I would like to get ganeti-instance-debootstrap into jessie again, I intend to make an upload fixing this tomorrow (debdiff attached), if nobody objects. Cheers, Apollon
diff -Nru dump-0.4b44/debian/changelog dump-0.4b44/debian/changelog
--- dump-0.4b44/debian/changelog 2013-09-20 23:00:32.000000000 +0300
+++ dump-0.4b44/debian/changelog 2014-09-29 14:37:27.000000000 +0300
@@ -1,3 +1,11 @@
+dump (0.4b44-5) unstable; urgency=medium
+
+ * QA upload.
+ * Fix restores of incremental backups when directories have been removed
+ since the full backup. Thanks to Ben Harris for the patch! (Closes: #714234)
+
+ -- Apollon Oikonomopoulos <apoikos@debian.org> Fri, 26 Sep 2014 16:16:52 +0300
+
dump (0.4b44-4) unstable; urgency=low
* QA upload.
diff -Nru dump-0.4b44/debian/patches/restore_rmdir dump-0.4b44/debian/patches/restore_rmdir
--- dump-0.4b44/debian/patches/restore_rmdir 1970-01-01 02:00:00.000000000 +0200
+++ dump-0.4b44/debian/patches/restore_rmdir 2014-09-29 14:17:16.000000000 +0300
@@ -0,0 +1,21 @@
+Author: Ben Harris
+Origin: http://sourceforge.net/p/dump/bugs/157/?page=1
+Description: Fix restore of incremental backups with removed directories
+Last-Update: 2014-08-01
+
+Index: restore/restore.c
+===================================================================
+RCS file: /cvsroot/dump/dump/restore/restore.c,v
+retrieving revision 1.39
+diff -u -r1.39 restore.c
+--- a/restore/restore.c 22 Mar 2010 16:08:10 -0000 1.39
++++ b/restore/restore.c 1 Aug 2014 14:03:56 -0000
+@@ -593,7 +593,7 @@
+ if (np->e_type == LEAF) {
+ removeleaf(np);
+ freeentry(np);
+- } else {
++ } else if (np->e_ino != 0){
+ np->e_flags |= TMPNAME;
+ deleteino(np->e_ino);
+ np->e_next = removelist;
diff -Nru dump-0.4b44/debian/patches/series dump-0.4b44/debian/patches/series
--- dump-0.4b44/debian/patches/series 2013-09-13 02:46:04.000000000 +0300
+++ dump-0.4b44/debian/patches/series 2014-09-29 14:17:16.000000000 +0300
@@ -1 +1,2 @@
bashism_in_examples
+restore_rmdir
Attachment:
signature.asc
Description: Digital signature