[prev in list] [next in list] [prev in thread] [next in thread]
List: bacula-commits
Subject: [Bacula-commits] [bacula.org] Bacula Community source branch
From: git () bacula ! org
Date: 2011-04-04 6:34:17
Message-ID: 20110404063417.F14C71CD4AA () bacula ! bacula ! org
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula Community source".
The branch, Branch-5.1 has been updated
via 0857e75d8745213c691cabd3e2b5265518bbb022 (commit)
via 4cc7e509b87b640aac83d8d9624f4f7ac964e52e (commit)
via da3d730b307afd1432722a4011a18924c02b712c (commit)
via 6aad3acda7d44adc467f669788de33c4f90f12bd (commit)
via 6c059d630eb4aeb3777540362ec46679a93e63d1 (commit)
via f0f4ec28d10dbc4b1648f0bdeaac65a8286594ce (commit)
via c61f389aa951ac75817cd042c41ec3162e8a44a2 (commit)
via 73d3daf8ce862e57cb79d51903b790e5ce7e52fc (commit)
via f878418a5edc40ac37b10d976ec1f39f319686cc (commit)
via 8a78a4e72e5c0eea39ff4d85927e8ce26a14ebea (commit)
via b9c1740bcc20624bdc38fc20ae2a195f07cb9c7c (commit)
via 6ad5de014d35ed7ef09e786dc5fef15ba76adece (commit)
from 01c982e422935371f9cb654bc6d51c691434209b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0857e75d8745213c691cabd3e2b5265518bbb022
Author: Kern Sibbald <kern@sibbald.com>
Date: Mon Apr 4 08:29:54 2011 +0200
Tweak update AUTHORS file
commit 4cc7e509b87b640aac83d8d9624f4f7ac964e52e
Author: Kern Sibbald <kern@sibbald.com>
Date: Sun Apr 3 09:25:11 2011 +0200
Fix reference to uninitialized stack variable
commit da3d730b307afd1432722a4011a18924c02b712c
Author: Kern Sibbald <kern@sibbald.com>
Date: Sun Apr 3 09:13:10 2011 +0200
Tweak add break to default
commit 6aad3acda7d44adc467f669788de33c4f90f12bd
Author: Kern Sibbald <kern@sibbald.com>
Date: Sun Apr 3 09:09:44 2011 +0200
Remove FATAL error for ignored events in old Exchange plugin
commit 6c059d630eb4aeb3777540362ec46679a93e63d1
Author: Kern Sibbald <kern@sibbald.com>
Date: Sat Apr 2 19:21:20 2011 +0200
Fix uninitialized stack variable in bextract
commit f0f4ec28d10dbc4b1648f0bdeaac65a8286594ce
Author: Kern Sibbald <kern@sibbald.com>
Date: Sat Apr 2 19:20:53 2011 +0200
Remove temp index on start and term of dbcheck
commit c61f389aa951ac75817cd042c41ec3162e8a44a2
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu Mar 31 09:35:26 2011 +0200
bweb: Add support note on about page
commit 73d3daf8ce862e57cb79d51903b790e5ce7e52fc
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed Mar 30 15:47:37 2011 +0200
Tweak add some information if joblog is missing
commit f878418a5edc40ac37b10d976ec1f39f319686cc
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue Mar 22 10:53:37 2011 +0100
regress: use $conf instead of $bin for binaries test
commit 8a78a4e72e5c0eea39ff4d85927e8ce26a14ebea
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon Mar 21 16:59:32 2011 +0100
regress: Add fix for ubuntu dash that adds quotes to "set" output
commit b9c1740bcc20624bdc38fc20ae2a195f07cb9c7c
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed Mar 30 13:40:50 2011 +0200
Update projects
commit 6ad5de014d35ed7ef09e786dc5fef15ba76adece
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed Mar 30 09:42:37 2011 +0200
tweak debug
-----------------------------------------------------------------------
Summary of changes:
diff --git a/bacula/AUTHORS b/bacula/AUTHORS
index 1e078c4..ddbbf32 100644
--- a/bacula/AUTHORS
+++ b/bacula/AUTHORS
@@ -16,6 +16,7 @@ Alan Brown
Aleksandar Milivojevic
Alexander Bergolth
Alexandre Baron
+Alexandre Simon
Allan Black
Andreas Piesk
Andrew Ford
diff --git a/bacula/projects b/bacula/projects
index 423e278..0f997e0 100644
--- a/bacula/projects
+++ b/bacula/projects
@@ -46,7 +46,7 @@ Item 36: Implement a Migration job type that will create a reverse
Item 37: Separate "Storage" and "Device" in the bacula-dir.conf
Item 38: Least recently used device selection for tape drives in autochanger.
Item 39: Implement a Storage device like Amazon's S3.
-Item 40: Convert tray monitor on Windows to a stand alone program
+Item*40: Convert tray monitor on Windows to a stand alone program
Item 41: Improve Bacula's tape and drive usage and cleaning management
Item 42: Relabel disk volume after recycling
diff --git a/bacula/src/qt-console/util/fmtwidgetitem.cpp b/bacula/src/qt-console/util/fmtwidgetitem.cpp
index 5aa520c..3971fc5 100644
--- a/bacula/src/qt-console/util/fmtwidgetitem.cpp
+++ b/bacula/src/qt-console/util/fmtwidgetitem.cpp
@@ -304,6 +304,9 @@ void ItemFormatterBase::setBytesFld(int index, const QString &fld)
case BYTES_CONVERSION_SI:
msg = convertBytesSI(qfld);
break;
+ default:
+ msg = " ";
+ break;
}
setNumericFld(index, msg, qfld);
diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index ca65673..286c474 100644
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -1,7 +1,7 @@
/*
Bacula ® - The Network Backup Solution
- Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
@@ -411,7 +411,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
#ifdef HAVE_LIBZ
if (extract) {
uLong compress_len = compress_buf_size;
- int stat;
+ int stat = Z_BUF_ERROR;
if (rec->maskedStream == STREAM_SPARSE_GZIP_DATA) {
ser_declare;
diff --git a/bacula/src/stored/vtape.c b/bacula/src/stored/vtape.c
index 16d9019..fc408a1 100644
--- a/bacula/src/stored/vtape.c
+++ b/bacula/src/stored/vtape.c
@@ -362,7 +362,6 @@ vtape::vtape()
current_block = -1;
max_block = VTAPE_MAX_BLOCK;
- Dmsg0(0, "I'm a vtape device\n");
}
int vtape::get_fd()
diff --git a/bacula/src/tools/dbcheck.c b/bacula/src/tools/dbcheck.c
index 7bdc044..20a403b 100644
--- a/bacula/src/tools/dbcheck.c
+++ b/bacula/src/tools/dbcheck.c
@@ -1,7 +1,7 @@
/*
Bacula ® - The Network Backup Solution
- Copyright (C) 2002-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2002-2011 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
@@ -32,8 +32,6 @@
*
* Kern E. Sibbald, August 2002
*
- * Version $Id$
- *
*/
#include "bacula.h"
@@ -307,6 +305,9 @@ int main (int argc, char *argv[])
return 1;
}
+ /* drop temporary index idx_tmp_name if it already exists */
+ drop_tmp_idx("idxPIchk", "File");
+
if (batch) {
repair_bad_paths();
repair_bad_filenames();
@@ -325,6 +326,9 @@ int main (int argc, char *argv[])
do_interactive_mode();
}
+ /* drop temporary index idx_tmp_name */
+ drop_tmp_idx("idxPIchk", "File");
+
db_close_database(NULL, db);
close_msg(NULL);
term_msg();
diff --git a/bacula/src/win32/filed/plugins/exchange-fd.c b/bacula/src/win32/filed/plugins/exchange-fd.c
index d0dc0bf..2222270 100644
--- a/bacula/src/win32/filed/plugins/exchange-fd.c
+++ b/bacula/src/win32/filed/plugins/exchange-fd.c
@@ -354,7 +354,8 @@ static bRC handlePluginEvent(bpContext *ctx, bEvent *event, void *value)
break;
default:
- _JobMessage(M_FATAL, "unknown event=%d\n", event->eventType);
+ _DebugMessage(0, "Ignored event=%d\n", event->eventType);
+ break;
}
bfuncs->getBaculaValue(ctx, bVarFDName, (void *)&name);
return bRC_OK;
diff --git a/gui/bweb/lang/en/tpl/about.tpl b/gui/bweb/lang/en/tpl/about.tpl
index 7035bd2..abf6bec 100644
--- a/gui/bweb/lang/en/tpl/about.tpl
+++ b/gui/bweb/lang/en/tpl/about.tpl
@@ -7,7 +7,7 @@
Bweb - A Bacula web interface
Bacula ® - The Network Backup Solution
- Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2006-2011 Free Software Foundation Europe e.V.
The main author of Bweb is Eric Bollengier.
The main author of Bacula is Kern Sibbald, with contributions from
@@ -35,4 +35,9 @@
nrsTable Copyright 2005 New Roads School (GPL)
kaiska css Copyright Willy Morin (BWL)
</pre>
+<p>
+
+Professional support on Bacula and Bweb is available through <a
+href="http://www.baculasystems.com">Bacula Systems</a>
+
</div>
diff --git a/gui/bweb/lang/es/tpl/about.tpl b/gui/bweb/lang/es/tpl/about.tpl
index 7035bd2..abf6bec 100644
--- a/gui/bweb/lang/es/tpl/about.tpl
+++ b/gui/bweb/lang/es/tpl/about.tpl
@@ -7,7 +7,7 @@
Bweb - A Bacula web interface
Bacula ® - The Network Backup Solution
- Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2006-2011 Free Software Foundation Europe e.V.
The main author of Bweb is Eric Bollengier.
The main author of Bacula is Kern Sibbald, with contributions from
@@ -35,4 +35,9 @@
nrsTable Copyright 2005 New Roads School (GPL)
kaiska css Copyright Willy Morin (BWL)
</pre>
+<p>
+
+Professional support on Bacula and Bweb is available through <a
+href="http://www.baculasystems.com">Bacula Systems</a>
+
</div>
diff --git a/gui/bweb/lang/fr/tpl/about.tpl b/gui/bweb/lang/fr/tpl/about.tpl
index 7035bd2..abf6bec 100644
--- a/gui/bweb/lang/fr/tpl/about.tpl
+++ b/gui/bweb/lang/fr/tpl/about.tpl
@@ -7,7 +7,7 @@
Bweb - A Bacula web interface
Bacula ® - The Network Backup Solution
- Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2006-2011 Free Software Foundation Europe e.V.
The main author of Bweb is Eric Bollengier.
The main author of Bacula is Kern Sibbald, with contributions from
@@ -35,4 +35,9 @@
nrsTable Copyright 2005 New Roads School (GPL)
kaiska css Copyright Willy Morin (BWL)
</pre>
+<p>
+
+Professional support on Bacula and Bweb is available through <a
+href="http://www.baculasystems.com">Bacula Systems</a>
+
</div>
diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index e487059..7e51781 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -4616,7 +4616,9 @@ SELECT count(1) AS nbline,
my $log = $self->dbh_selectrow_hashref($query);
unless ($log) {
- return $self->error("Can't get log for jobid $arg->{jobid}");
+ return $self->error("Can't get log for jobid $arg->{jobid}, check that
+your 'Messages' resources include 'catalog = all' and you loaded Bweb SQL
+functions in your Catalog.");
}
$log->{logtxt} =~ s/\0//g;
$self->display({ lines=> $log->{logtxt},
diff --git a/gui/bweb/tpl/about.tpl b/gui/bweb/tpl/about.tpl
index c769272..282a45c 100644
--- a/gui/bweb/tpl/about.tpl
+++ b/gui/bweb/tpl/about.tpl
@@ -7,7 +7,7 @@
Bweb - A Bacula web interface
Bacula ® - The Network Backup Solution
- Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2006-2011 Free Software Foundation Europe e.V.
The main author of Bweb is Eric Bollengier.
The main author of Bacula is Kern Sibbald, with contributions from
@@ -35,4 +35,9 @@
nrsTable Copyright 2005 New Roads School (GPL)
kaiska css Copyright Willy Morin (BWL)
</pre>
+<p>
+
+__Professional support on Bacula and Bweb is available through__ <a
+href="http://www.baculasystems.com">Bacula Systems</a>
+
</div>
diff --git a/regress/scripts/copy-test-confs b/regress/scripts/copy-test-confs
index 78d1a2e..c063abe 100755
--- a/regress/scripts/copy-test-confs
+++ b/regress/scripts/copy-test-confs
@@ -1,8 +1,8 @@
#!/bin/sh
-/bin/cp -f ${rscripts}/new-test-bacula-dir.conf ${bin}/bacula-dir.conf
-/bin/cp -f ${rscripts}/test-bacula-sd.conf ${bin}/bacula-sd.conf
-/bin/cp -f ${rscripts}/test-bacula-fd.conf ${bin}/bacula-fd.conf
-/bin/cp -f ${rscripts}/test-console.conf ${bin}/bconsole.conf
-/bin/cp -f ${rscripts}/test-console.conf ${bin}/bat.conf
+/bin/cp -f ${rscripts}/new-test-bacula-dir.conf ${conf}/bacula-dir.conf
+/bin/cp -f ${rscripts}/test-bacula-sd.conf ${conf}/bacula-sd.conf
+/bin/cp -f ${rscripts}/test-bacula-fd.conf ${conf}/bacula-fd.conf
+/bin/cp -f ${rscripts}/test-console.conf ${conf}/bconsole.conf
+/bin/cp -f ${rscripts}/test-console.conf ${conf}/bat.conf
${rscripts}/set_tape_options
diff --git a/regress/scripts/functions.pm b/regress/scripts/functions.pm
index a9774a5..0d7d571 100644
--- a/regress/scripts/functions.pm
+++ b/regress/scripts/functions.pm
@@ -73,7 +73,7 @@ BEGIN {
open(IN, ". ./config; set |") or die "Could not run shell: $!\n";
while ( my $l = <IN> ) {
chomp ($l);
- if ($l =~ /^([\w\d]+)=(.+)/) {
+ if ($l =~ /^([\w\d]+)='?([^']+)'?/) {
next if ($1 eq 'SHELLOPTS'); # is in read-only
($envar,$enval) = ($1, $2);
$ENV{$envar} = $enval;
@@ -571,7 +571,7 @@ sub debug
sub remote_config
{
open(FP, ">$REMOTE_FILE/bacula-fd.conf") or
- die "ERROR: Can't open $REMOTE_FILE/bacula-fd.conf $?";
+ die "ERROR: Can't open $REMOTE_FILE/bacula-fd.conf $!";
print FP "
Director {
Name = $HOST-dir
hooks/post-receive
--
Bacula Community source
------------------------------------------------------------------------------
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself;
WebMatrix provides all the features you need to develop and
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic