From d23aa9cb070e477d7942f15dba2fa7571496f234 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 12 Sep 2006 19:57:14 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3462 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/bacula-dir-migration.conf.in | 4 ++-- regress/scripts/bacula-dir-tape.conf.in | 5 ++--- regress/scripts/bacula-dir-win32-tape.conf.in | 4 ++-- regress/scripts/prepare-two-disks | 2 +- regress/tests/incremental-2disk | 2 +- regress/weird-files.tar.gz | Bin 1699 -> 1721 bytes 6 files changed, 8 insertions(+), 9 deletions(-) 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 f84d1c0a6de310a1caa2fa48237b2eeda3be9bb0..94a12dd3179fefc4e53a62ac4e4070fd285b8cae 100644 GIT binary patch literal 1721 zcmZ{k`#;qA0>-DTT=H_iG^W-nn<$h^>7s9qa?2%To%Wap8xFC9F1lD>D=G)!G!kMa z)6wW67R|8B7mIOR8X9JH7=tCWNnZ&4X&F?q_^Cgnh}olegz;r6W}q412;cbHMl z)^1}H<9D?6q09R!{?+k$0ZvYqRKD*w`Z~^qAbERicSE1+o5C#Ro*79>kC`v?axOWG zFE#SZX5!<+Elhu*=i3{#wvNT1pOx1x_AseTfu^D&{yS@_aX?tkOGW~HKlx*yzgz!U z1e}NsjBNOzq@zzS@wKuKIflejaax1l=MI9)#bwxgTY?y5&7%L#B{+99< z-tyxVdvxLtqLO$XFSylZN1Fyab`Y=^@{94!ij(FMw9YQ-AT_EOSMt#;WZO{FOaH=g z_uz-a2L?#{FY7AzJ}_jL4TFU9W{o)`O#9wmJ3$CmC=ID90em=IC*W-KIy6o(zdD)r ze#u}o`B11jB*>2trdDL}c(ssqB!LM$)s>Bt%iT2{NnB0ab;zC}w@Q;!rtR*^tnSj* ztni8+Lk04^p4UZw#*vPr%iuc7dQhO5y+%HzgtmE$!-J?O!>to5fpI0Ki^yB>y_)+W zb6ycz?)M4|1;izN(4~TBfR`J2F2*$%w5wNJ;Uv^M`dVNnTJiT2eS2jK`d(XpTM3*E zRa~{swW&jG$*0v;ch7_3ep~K_iJ)4#t6&yd`yKPZUJx}++@c`OBLBI^klrjRyD{L7 z1$LX+^^M9YCU(?K%n7NFf>y&hRbK~g7e|-3W%dHihFLhtoKIIjndk=Q3ve$LIO$G< zf!H{et<&IzQs#0BCT>kj2^eyC5(F&=FExW!%csm_u)68L$9b6Ij9#r+_bq;|^Gr~n zX%x8p_8ZhYG7T-nuV6pZln0rx(av>bdqYxh*1Q_Y^`R$$G_xYSqW~P2Akd$`4*EBA zA&$B3l*ydiYC2#KP+d(d<&dcL#i4Ep~KJlTL zDRH)3bV?^4jLP=}|0CdidA_yt>!l8*DK)60oYpNdG1_Yl@;vEqxK!z{ZlPv{GR%ih zYUz!`!P*krT_q#_@VsO}XK}L%csv+8B(`WqcZv&7(;*Q(-%IgAM+WVFhW0lv_}c@BSIN!%y|@ zD3ecdf$N$CbgI~nS)3dt_y&l4K&%KkWB)M$4Yw%2pNZZ_NiBO8$spbX@RZQE?I^<< z^B36hT6BjoMJXGPdsd~FSkq7aHSutx8|?I2K7xa!88=qnX*E&?wwuImYa6K^{E`b= zf3_4l3hOqE8?ilqEIPZ7gvzzUIMIi2E#l~6-c;sF%`xwP2YCI{*ty{SQA%$@*5g;#t0GisA}B%?WR0?>?Yd!PVc?Rg)DX}xYY2aAI&FnJDCl8UJcjyXPPnMs zSXP$c>QRuPx{rc==|~@G#0RTcnP}m=2*PI+Q#0omYPtsCQrH1pMB7v(`H@TQM6^Nm zlYHUJkvr+|4eSdQTO}jmvFFbG$%R8ZZDf$HuG^|dvlQA;-&t9D4Lm2wDZil7&Fg3+ zPY94IpsR$>&Uh-JQCP=t|J|gGg6k*oj|&gbiqWniP*ht)h4t|2VDA{$5sFL>k$s*3 zT+S|a@R1nT4-~Eljsg_-oxR}7oIU3GaQzc@7%t}N3s@$laL8RKg!%t6_yTcB>An~$ G2J>J4J-*-o literal 1699 zcmaLW`#;nB0|#&xaSo5KOA@EcB)(FM$g$G+Y;<;#xh%zswd0(_p@`08-xMFWFLiP) z>^NKDtbc)2M4ebxF9kpMqbohpgPyp~w@}o0sLIZwfHn1=^xOUT-#6_h zPGjg>e)-~y?iXwBcYS<`tBcV7N9q8FHLJjD%}(oE@@=xN@3&koDWrXD8T#7u$j*r( zS@AcX-Z8islPmSR-rd9Hc9~6&P7{z}&2&9PRS=L~oMWNJtoK;@FZk29jEZml+2eL( z&>KE&on>xok~sdd{NA=J-&mY;{9c1I-3=9a9vaaWc!^4805k6c9ue1X@3(ISFL8{T zW=->`D;GeP!0}B9u;&dR2j6FXD+8uhbgN?jLhllFBIe;D4hF4tLugJH% z{~BrJnIPG0JQ#f-G&4MqNw>(XeacCm?lYu?DqsdY8Ou7@*qOkIBgLWOw{%oYM;*#q zj29pshY2WaiQm2gH*U$l{sf6gW2ym1>-@XBW&dSgT?CkN`x$hihS32=mW6rbFPESJ zn3sAchR8&$&HkE(nJ-V2CmPA&S>SIweAN0p0z)VpfyozQkw72gfHYJZMxa!!4*e@i zw`+MkCcGMAyX4)zy6K$W9Bg_C5%0QjQW|*f>KMx{9~?{2B#A5(d*>T;5!S-E9Z!0Z zK%odC2Rh&mJj!mYc)!|^Vq5{RX$``=5ztnPd#&4gU6*1@37HbGv2hZPEA4!Q{3;az z%SpH^LhEcO12a+as6%fLW%AM7g|v|cKt~yQU|%O)6X-(;2yX@}Z(*aCG1WDB;Pr<~ zjdo8}y060vdx2i&DmDXAL0>liRKXq1=|uRlVnDwfx6jfI3+%Z;QlQ*rv-WvE0zPgW zw~xx+h^CZTBXxPMk~6@*h-x>-49W*Va$ryy0CR7xGR2u+P4#uDu!IbikW}*mTu4B6 zgiQC5fDNGzb_snx+ay!77onp;G_YBZ0eoFMAMbp2XWq*PKJxaksBts+;hJ=rkwh)? zA;R&9QocqDJn1|^0SA%D1D2E>9Ni4yBbx!iH~pCpXoUFY+Eo*eOg1Uzn(YA}I%|sjt9f zMmkE`ISDr47nMmFV-=%H1!-sK`X&GD?Bpg_VnM|5woT98nDfQU(1v;-ZqCv|hLalj zqQYPm7`^=yD8!`(7)cLELYt<9XF$Q{TS2mk`{$8m; z#ljnJGh6>3epu?=UqSS2ljewQ_yTDUSJTl zChgC~fIZ_s#inw^rTp_wPN)FEx}$={aT}D?XDh@S#w+0sUWtQsTsu0O|qYN3$^VeT~Nd+d6$sXyZ2U1ddU{vznEGS5lDk*l~iZ zf;d7D%><_rJQr-t%8|e|sJTtZdg<)unZ#UNIgPvn`6CQO1d}l8oVFqC`D5e_h~u4Q l*!&Z$EKh`rk97O1{J8qr8l>}oGQStB^T*zNtW%+*^AD9Qop}HN -- 2.39.5