This fixes a bug where bcopy copied too many records.
git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7424
91ce42f0-d328-0410-95d8-
f526ca767f89
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
Pmsg0(000, _("Volume label not copied.\n"));
return true;
case SOS_LABEL:
Pmsg0(000, _("Volume label not copied.\n"));
return true;
case SOS_LABEL:
+ if (bsr && rec->match_stat < 1) {
+ /* Skipping record, because does not match BSR filter */
+ if (verbose) {
+ Pmsg0(-1, _("Copy skipped. Record does not match BSR filter.\n"));
+ }
+ } else {
+ jobs++;
+ }
+ if (bsr && rec->match_stat < 1) {
+ /* Skipping record, because does not match BSR filter */
+ return true;
+ }
while (!write_record_to_block(out_block, rec)) {
Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec->data_len,
rec->remainder);
while (!write_record_to_block(out_block, rec)) {
Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec->data_len,
rec->remainder);
+ if (bsr && rec->match_stat < 1) {
+ /* Skipping record, because does not match BSR filter */
+ return true;
+ }
records++;
while (!write_record_to_block(out_block, rec)) {
Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec->data_len,
records++;
while (!write_record_to_block(out_block, rec)) {
Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec->data_len,
General:
Release Version 2.4.2
23Jul08
General:
Release Version 2.4.2
23Jul08
+kes Apply patch submitted for bug #1107 with a small modification.
+ This fixes a bug where bcopy copied too many records.
kes Make some tweaks to bsmtp based on patch submitted in bug #1124.
This fixes bug #1124.
kes Make the default bat restore Pool be Any. This fixes bug #1118.
kes Make some tweaks to bsmtp based on patch submitted in bug #1124.
This fixes bug #1124.
kes Make the default bat restore Pool be Any. This fixes bug #1118.