From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 25 Nov 2007 21:29:11 +0000 (+0000)
Subject: kes  This patch fixes the status command to include the formating string for
X-Git-Tag: Release-2.2.7~32
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1018ba84a4d482325df3baa50d9d3c6487fb3db9;p=bacula%2Fbacula

kes  This patch fixes the status command to include the formating string for
     JS_AttrInsterting.  It fixes bug #1021.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5986 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/patches/2.2.6-status.patch b/bacula/patches/2.2.6-status.patch
new file mode 100644
index 0000000000..961846374e
--- /dev/null
+++ b/bacula/patches/2.2.6-status.patch
@@ -0,0 +1,46 @@
+  This patch fixes the status command to include the formating string for
+  JS_AttrInsterting.  It fixes bug #1021.
+
+  Apply it to version 2.2.6 (and possibly earlier versions) with:
+
+  cd <bacula-source>
+  patch -p0 <2.2.6-status.patch
+  ./configure <your-options>
+  make
+  ...
+  make install
+
+
+Index: src/dird/ua_status.c
+===================================================================
+--- src/dird/ua_status.c	(revision 5979)
++++ src/dird/ua_status.c	(working copy)
+@@ -636,6 +636,12 @@
+       case JS_WaitPriority:
+          msg = _("is waiting for higher priority jobs to finish");
+          break;
++      case JS_AttrDespooling:
++         msg = _("SD despooling Attributes");
++         break;
++      case JS_AttrInserting:
++         msg = _("Dir inserting Attributes");
++         break;
+ 
+       default:
+          emsg = (char *)get_pool_memory(PM_FNAME);
+@@ -673,8 +679,14 @@
+             Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
+                  jcr->client->name(), jcr->wstore->name());
+         }
+-         msg = emsg;
++        msg = emsg;
++        break;
++      case JS_AttrDespooling:
++         msg = _("SD despooling Attributes");
+          break;
++      case JS_AttrInserting:
++         msg = _("Dir inserting Attributes");
++         break;
+       }
+       switch (jcr->JobType) {
+       case JT_ADMIN:
diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 15acb884b6..1d267c33b2 100644
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -636,6 +636,12 @@ static void list_running_jobs(UAContext *ua)
       case JS_WaitPriority:
          msg = _("is waiting for higher priority jobs to finish");
          break;
+      case JS_AttrDespooling:
+         msg = _("SD despooling Attributes");
+         break;
+      case JS_AttrInserting:
+         msg = _("Dir inserting Attributes");
+         break;
 
       default:
          emsg = (char *)get_pool_memory(PM_FNAME);
@@ -673,7 +679,13 @@ static void list_running_jobs(UAContext *ua)
             Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
                  jcr->client->name(), jcr->wstore->name());
         }
-         msg = emsg;
+        msg = emsg;
+        break;
+      case JS_AttrDespooling:
+         msg = _("SD despooling Attributes");
+         break;
+      case JS_AttrInserting:
+         msg = _("Dir inserting Attributes");
          break;
       }
       switch (jcr->JobType) {
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index cffcc4f4c5..cb1147f25f 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -2,6 +2,8 @@
 
 General:
 25Nov07
+kes  This patch fixes the status command to include the formating string for
+     JS_AttrInsterting.  It fixes bug #1021.
 kes  This patch should fix the Mac OS X build problem on the latest
      Darwin, where sys/types.h was not included correctly (apparently
      due to a change in the Mac headers).  The solution was to explicitly