From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 12 Sep 2006 19:57:14 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-2.0.0~455
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d23aa9cb070e477d7942f15dba2fa7571496f234;p=bacula%2Fbacula

Update


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

diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in
index cd5309e078..fb577c7666 100644
--- a/regress/scripts/bacula-dir-migration.conf.in
+++ b/regress/scripts/bacula-dir-migration.conf.in
@@ -181,8 +181,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all, !terminate
   operator = @job_email@ = mount
   console = all, !skipped, !terminate, !restored
diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index dc2475327e..ca90370c55 100644
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -139,8 +139,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all, !terminate
   operator = @job_email@ = mount
   console = all, !skipped, !terminate, !restored
@@ -195,4 +195,3 @@ Pool {
   AutoPrune = yes                     # Prune expired volumes
   Volume Retention = 365d             # one year
 }
-
diff --git a/regress/scripts/bacula-dir-win32-tape.conf.in b/regress/scripts/bacula-dir-win32-tape.conf.in
index 2ea42a8392..bf29899b56 100644
--- a/regress/scripts/bacula-dir-win32-tape.conf.in
+++ b/regress/scripts/bacula-dir-win32-tape.conf.in
@@ -110,8 +110,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all, !terminate
   operator = @job_email@ = mount
   console = all, !skipped, !terminate, !restored
diff --git a/regress/scripts/prepare-two-disks b/regress/scripts/prepare-two-disks
index 1a8c6db46d..959daa4201 100755
--- a/regress/scripts/prepare-two-disks
+++ b/regress/scripts/prepare-two-disks
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Cread fresh virtual disk changer directory
+# Create fresh virtual disk changer directory
 #
 rm -rf tmp/disk-changer
 mkdir tmp/disk-changer
diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk
index 68eb9f452d..a2227f79bb 100755
--- a/regress/tests/incremental-2disk
+++ b/regress/tests/incremental-2disk
@@ -5,7 +5,7 @@
 #
 # This script uses the virtual disk autochanger
 #
-TestName="incremental-2disk-test"
+TestName="incremental-2disk"
 JobName=Inc2disk
 . scripts/functions
 set_debug 0
diff --git a/regress/weird-files.tar.gz b/regress/weird-files.tar.gz
index f84d1c0a6d..94a12dd317 100644
Binary files a/regress/weird-files.tar.gz and b/regress/weird-files.tar.gz differ