In restore -C, encountering an unexpected file is not an error.

diff --git a/CHANGES b/CHANGES
index fac37c9506467d1bbbdb8d56495ab15394e11612..77981df4e33e8ebf6d283cee7441672f24654bc3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.288 2008/04/17 15:19:12 stelian Exp $
+$Id: CHANGES,v 1.289 2008/04/17 15:22:56 stelian Exp $

 
 Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
 =====================================================================
 
 Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
 =====================================================================


@@ -28,6 +28,11 @@ Changes between versions 0.4b41 and 0.4b42 (released xxxxxxxxxxxxxxx)
        instead of libtermcap or libncurses libraries. Thanks to
        Adam Tkac <atkac@redhat.com> for the patch.
 
        instead of libtermcap or libncurses libraries. Thanks to
        Adam Tkac <atkac@redhat.com> for the patch.
 

+7.     When comparing a backup, do not consider to be an error the fact
+       that we encounter files created while dump was in progress.
+       Thanks to Kenneth Porter <shiva@sewingwitch.com> for the bug
+       report.
+

 Changes between versions 0.4b40 and 0.4b41 (released January 2, 2006)
 =====================================================================
 
 Changes between versions 0.4b40 and 0.4b41 (released January 2, 2006)
 =====================================================================
 

diff --git a/restore/restore.c b/restore/restore.c
index 67a8465904dd26f81a911f249cd7cc8e0c80b77a..c87b532d39cfc9046650febb5195e17400a2b4ef 100644 (file)
--- a/restore/restore.c
+++ b/restore/restore.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: restore.c,v 1.37 2005/07/07 09:16:08 stelian Exp $";
+       "$Id: restore.c,v 1.38 2008/04/17 15:22:56 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -716,7 +716,6 @@ compareleaves(void)
                if (first != curfile.ino) {
                        fprintf(stderr, "expected next file %ld, got %lu\n",
                                (long)first, (unsigned long)curfile.ino);
                if (first != curfile.ino) {
                        fprintf(stderr, "expected next file %ld, got %lu\n",
                                (long)first, (unsigned long)curfile.ino);

-                       do_compare_error;

                        skipfile();
                        goto next;
                }
                        skipfile();
                        goto next;
                }