From ede9c5966611dcde732faed3c6b778cac86d1a71 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sun, 24 Feb 2008 19:58:16 +0000 Subject: [PATCH] ebl Update strippath and cleanup git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6485 91ce42f0-d328-0410-95d8-f526ca767f89 --- .../patches/testing/project-accurate-backup.patch2 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bacula/patches/testing/project-accurate-backup.patch2 b/bacula/patches/testing/project-accurate-backup.patch2 index 833c056294..01767e7827 100644 --- a/bacula/patches/testing/project-accurate-backup.patch2 +++ b/bacula/patches/testing/project-accurate-backup.patch2 @@ -323,7 +323,7 @@ Index: src/dird/inc_conf.c scan_err1(lc, _("Expected a strip path positive integer, got:%s:"), lc->str); Index: src/filed/backup.c =================================================================== ---- src/filed/backup.c (révision 6471) +--- src/filed/backup.c (révision 6484) +++ src/filed/backup.c (copie de travail) @@ -37,6 +37,7 @@ @@ -376,7 +376,7 @@ Index: src/filed/backup.c + } + + strip_path(ff_pkt); -+ ++ + if (S_ISDIR(ff_pkt->statp.st_mode)) { + fname = ff_pkt->link; + } else { @@ -1072,7 +1072,13 @@ Index: src/findlib/find_one.c * Find a single file. * handle_file is the callback for handling the file. * p is the filename -@@ -333,16 +360,13 @@ +@@ -327,22 +354,18 @@ + } + ff_pkt->volhas_attrlist = volume_has_attrlist(fname); + } +- + /* + * If this is an Incremental backup, see if file was modified * since our last "save_time", presumably the last Full save * or Incremental. */ @@ -1096,7 +1102,7 @@ Index: src/findlib/find_one.c } #ifdef HAVE_DARWIN_OS -@@ -502,10 +526,7 @@ +@@ -502,10 +525,7 @@ link[len] = 0; ff_pkt->link = link; -- 2.39.5