From a1b0efb3e5702a0043b24dc7b965776e56bd5817 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sun, 24 Feb 2008 14:53:54 +0000 Subject: [PATCH] ebl cleanup git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6480 91ce42f0-d328-0410-95d8-f526ca767f89 --- .../testing/project-accurate-backup.patch2 | 37 +------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/bacula/patches/testing/project-accurate-backup.patch2 b/bacula/patches/testing/project-accurate-backup.patch2 index 5d420bdec1..833c056294 100644 --- a/bacula/patches/testing/project-accurate-backup.patch2 +++ b/bacula/patches/testing/project-accurate-backup.patch2 @@ -185,17 +185,6 @@ Index: src/dird/catreq.c int len; char *fname, *attr; ATTR_DBR *ar = NULL; -@@ -398,8 +399,8 @@ - unser_uint32(data_len); - p += unser_length(p); - -- Dmsg1(400, "UpdCat msg=%s\n", bs->msg); -- Dmsg5(400, "UpdCat VolSessId=%d VolSessT=%d FI=%d Strm=%d data_len=%d\n", -+ Dmsg1(1, "UpdCat msg=%s\n", bs->msg); -+ Dmsg5(1, "UpdCat VolSessId=%d VolSessT=%d FI=%d Strm=%d data_len=%d\n", - VolSessionId, VolSessionTime, FileIndex, Stream, data_len); - - if (Stream == STREAM_UNIX_ATTRIBUTES || Stream == STREAM_UNIX_ATTRIBUTES_EX) { @@ -415,6 +416,7 @@ p = jcr->attr - bs->msg + p; /* point p into jcr->attr */ skip_nonspaces(&p); /* skip FileIndex */ @@ -634,16 +623,6 @@ Index: src/filed/backup.c free_pool_memory(jcr->acl_text); stop_heartbeat_monitor(jcr); -@@ -1066,8 +1320,8 @@ - Jmsg0(jcr, M_FATAL, 0, _("Invalid file flags, no supported data stream type.\n")); - return false; - } -+ - encode_stat(attribs, ff_pkt, data_stream); -- - /* Now possibly extend the attributes */ - attr_stream = encode_attribsEx(jcr, attribsEx, ff_pkt); - @@ -1102,7 +1356,9 @@ * For a directory, link is the same as fname, but with trailing * slash. For a linked file, link is the link. @@ -1023,14 +1002,6 @@ Index: src/lib/attr.c if (!jcr->id_list) { jcr->id_list = new_guid_list(); } -@@ -268,6 +276,7 @@ - *p++ = *f++; - } - } -+ - *p++ = '\n'; - *p = 0; - Dmsg1(20, "%s", buf); Index: src/findlib/create_file.c =================================================================== --- src/findlib/create_file.c (révision 6471) @@ -1125,7 +1096,7 @@ Index: src/findlib/find_one.c } #ifdef HAVE_DARWIN_OS -@@ -502,15 +526,13 @@ +@@ -502,10 +526,7 @@ link[len] = 0; ff_pkt->link = link; @@ -1137,12 +1108,6 @@ Index: src/findlib/find_one.c /* Incremental option, directory entry not changed */ ff_pkt->type = FT_DIRNOCHG; } else { - ff_pkt->type = FT_DIRBEGIN; - } -+ - /* We have set st_rdev to 1 if it is a reparse point, otherwise 0 */ - if (have_win32_api() && ff_pkt->statp.st_rdev) { - ff_pkt->type = FT_REPARSE; Index: src/findlib/find.h =================================================================== --- src/findlib/find.h (révision 6471) -- 2.39.5