From 79dcb10a77c5481ca24ba452e3cfd998382fa56c Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 31 Mar 2007 15:34:43 +0000 Subject: [PATCH] Simplify Job report first line + move debug code git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4478 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/backup.c | 2 +- bacula/src/dird/migrate.c | 2 +- bacula/src/dird/restore.c | 2 +- bacula/src/dird/verify.c | 2 +- bacula/src/stored/append.c | 7 +++---- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index c90f7b5141..42eb46b169 100644 --- a/bacula/src/dird/backup.c +++ b/bacula/src/dird/backup.c @@ -438,7 +438,7 @@ void backup_cleanup(JCR *jcr, int TermCode) // bmicrosleep(15, 0); /* for debugging SIGHUP */ - Jmsg(jcr, msg_type, 0, _("Bacula %s Version: %s (%s) %s %s %s at %s\n" + Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s) %s %s %s at %s\n" " JobId: %d\n" " Job: %s\n" " Backup Level: %s%s\n" diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c index abe785e4b4..cb37dad38a 100644 --- a/bacula/src/dird/migrate.c +++ b/bacula/src/dird/migrate.c @@ -1152,7 +1152,7 @@ void migration_cleanup(JCR *jcr, int TermCode) jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); - Jmsg(jcr, msg_type, 0, _("Bacula %s Version: %s (%s) %s %s %s at %s\n" + Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s) %s %s %s at %s\n" " Prev Backup JobId: %s\n" " New Backup JobId: %s\n" " Migration JobId: %s\n" diff --git a/bacula/src/dird/restore.c b/bacula/src/dird/restore.c index b150a0d564..7fad180885 100644 --- a/bacula/src/dird/restore.c +++ b/bacula/src/dird/restore.c @@ -280,7 +280,7 @@ void restore_cleanup(JCR *jcr, int TermCode) jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg)); jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); - Jmsg(jcr, msg_type, 0, _("Bacula %s Version: %s (%s) %s %s %s at %s\n" + Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s) %s %s %s at %s\n" " JobId: %d\n" " Job: %s\n" " Client: %s\n" diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c index 54450a2d2c..18dc5d8cc2 100644 --- a/bacula/src/dird/verify.c +++ b/bacula/src/dird/verify.c @@ -412,7 +412,7 @@ void verify_cleanup(JCR *jcr, int TermCode) jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg)); if (jcr->JobLevel == L_VERIFY_VOLUME_TO_CATALOG) { jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); - Jmsg(jcr, msg_type, 0, _("Bacula %s Version: %s (%s) %s %s %s at %s\n" + Jmsg(jcr, msg_type, 0, _("Bacula %s %s (%s) %s %s %s at %s\n" " JobId: %d\n" " Job: %s\n" " FileSet: %s\n" diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c index 402324fa4d..78c8524369 100644 --- a/bacula/src/stored/append.c +++ b/bacula/src/stored/append.c @@ -305,11 +305,10 @@ bool do_append_data(JCR *jcr) Dmsg0(100, _("Set ok=FALSE after write_block_to_device.\n")); ok = false; } + if (dev->VolCatInfo.VolCatName[0] == 0) { + Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n")); + } } - if (dev->VolCatInfo.VolCatName[0] == 0) { - Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n")); - } - if (!ok) { -- 2.39.5