From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 29 Jul 2009 19:37:18 +0000 (+0200)
Subject: make base backup work
X-Git-Tag: Release-5.0.0~371
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0c3a27c388bfa24c405edf0cb1d3762407e2def5;p=bacula%2Fbacula

make base backup work
---

diff --git a/bacula/src/filed/accurate.c b/bacula/src/filed/accurate.c
index c9cec9b40b..9e63ed3ae6 100644
--- a/bacula/src/filed/accurate.c
+++ b/bacula/src/filed/accurate.c
@@ -368,7 +368,7 @@ bool accurate_check_file(JCR *jcr, FF_PKT *ff_pkt)
    }
 
    accurate_mark_file_as_seen(jcr, &elt);
-   Dmsg2(dbglvl, "accurate %s = %d\n", fname, stat);
+//   Dmsg2(dbglvl, "accurate %s = %d\n", fname, stat);
 
 bail_out:
    unstrip_path(ff_pkt);
diff --git a/bacula/src/findlib/find_one.c b/bacula/src/findlib/find_one.c
index 5619ea43a8..38fbfa47b3 100644
--- a/bacula/src/findlib/find_one.c
+++ b/bacula/src/findlib/find_one.c
@@ -384,8 +384,7 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt,
     * since our last "save_time", presumably the last Full save
     * or Incremental.
     */
-   if (   ff_pkt->incremental 
-       && !S_ISDIR(ff_pkt->statp.st_mode) 
+   if (   !S_ISDIR(ff_pkt->statp.st_mode) 
        && !check_changes(jcr, ff_pkt)) 
    {
       Dmsg1(500, "Non-directory incremental: %s\n", ff_pkt->fname);
@@ -581,8 +580,8 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt,
       link[len] = 0;
 
       ff_pkt->link = link;
-      if (ff_pkt->incremental && !check_changes(jcr, ff_pkt)) {
-         /* Incremental option, directory entry not changed */
+      if (!check_changes(jcr, ff_pkt)) {
+         /* Incremental/Full+Base option, directory entry not changed */
          ff_pkt->type = FT_DIRNOCHG;
       } else {
          ff_pkt->type = FT_DIRBEGIN;