From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 3 Mar 2010 08:11:58 +0000 (+0100)
Subject: Display AllowCompress warning message only if compression used in FileSet
X-Git-Tag: Release-5.2.1~1655
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=30dff9d500af6f8156f79c768c72568cf6f32a1b;p=bacula%2Fbacula

Display AllowCompress warning message only if compression used in FileSet
---

diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c
index f85b39f481..6b99d9992c 100644
--- a/bacula/src/dird/fd_cmds.c
+++ b/bacula/src/dird/fd_cmds.c
@@ -374,21 +374,24 @@ static bool send_fileset(JCR *jcr)
             /* Strip out compression option Zn if disallowed for this Storage */
             if (store && !store->AllowCompress) {
                char newopts[MAX_FOPTS];
+               bool done=false;         /* print warning only if compression enabled in FS */ 
                int j = 0;
                for (k=0; fo->opts[k]!='\0'; k++) {                   
                  /* Z compress option is followed by the single-digit compress level */
                  if (fo->opts[k]=='Z') {
+                    done=true;
                     k++;                /* skip option and level */
                  } else {
                     newopts[j] = fo->opts[k];
-                   j++;
+                    j++;
                  }
                }
                newopts[j] = '\0';
 
-               Jmsg(jcr, M_INFO, 0,
-                   _("FD compression disabled for this Job because AllowCompress=No in Storage resource.\n") );
-
+               if (done) {
+                  Jmsg(jcr, M_INFO, 0,
+                      _("FD compression disabled for this Job because AllowCompress=No in Storage resource.\n") );
+               }
                /* Send the new trimmed option set without overwriting fo->opts */
                fd->fsend("O %s\n", newopts);
             } else {