From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 19 May 2009 15:21:45 +0000 (+0000)
Subject: Simplify messages printed by SD when reserve fails. This should fix bug #1285
X-Git-Tag: Release-3.0.2~226
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0661d53b1cfee355c831be8cc82b686a51c25daa;p=bacula%2Fbacula

Simplify messages printed by SD when reserve fails. This should fix bug #1285

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8840 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/stored/reserve.c b/bacula/src/stored/reserve.c
index e373e8dcaa..67e42be464 100644
--- a/bacula/src/stored/reserve.c
+++ b/bacula/src/stored/reserve.c
@@ -353,10 +353,8 @@ static bool use_storage_cmd(JCR *jcr)
           */
          unbash_spaces(dir->msg);
          pm_strcpy(jcr->errmsg, dir->msg);
-         Jmsg(jcr, M_INFO, 0, _("Failed command: %s\n"), jcr->errmsg);
-         Jmsg(jcr, M_FATAL, 0, _("\n"
-            "     Device \"%s\" with MediaType \"%s\" requested by DIR not found in SD Device resources.\n"),
-              dev_name.c_str(), media_type.c_str());
+         Jmsg(jcr, M_FATAL, 0, _("Device reservation failed for JobId=%d: %s\n"), 
+              jcr->JobId, jcr->errmsg);
          dir->fsend(NO_device, dev_name.c_str());
 
          Dmsg1(dbglvl, ">dird: %s", dir->msg);
diff --git a/bacula/technotes b/bacula/technotes
index e024cceca3..5f793fc026 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,6 +2,9 @@
           
 General:
 
+18May09
+kes  Simplify messages printed by SD when reserve fails. This
+     should fix bug #1285.
 16May09
 kes  Create archivedir.
 15May09