1 Index: src/stored/block.c
2 ===================================================================
3 RCS file: /cvsroot/bacula/bacula/src/stored/block.c,v
4 retrieving revision 1.116.2.3
5 diff -u -u -b -r1.116.2.3 block.c
6 --- src/stored/block.c 24 Mar 2006 16:35:23 -0000 1.116.2.3
7 +++ src/stored/block.c 12 Jun 2006 16:19:27 -0000
12 - Copyright (C) 2001-2005 Kern Sibbald
13 + Copyright (C) 2001-2006 Kern Sibbald
15 This program is free software; you can redistribute it and/or
16 modify it under the terms of the GNU General Public License
18 Dmsg3(100, "Tests : %d %d %d\n", (dev->VolCatInfo.VolCatParts > 0),
19 ((dev->file_addr-dev->part_start) == dev->part_size),
20 (dev->part <= dev->VolCatInfo.VolCatParts));*/
21 - /* Check for part file end */
22 - if ((dev->num_parts > 0) &&
23 - ((dev->file_addr-dev->part_start) == dev->part_size) &&
24 - (dev->part < dev->num_parts)) {
25 + /* Check for DVD part file end */
26 + if (dev->at_eof() && dev->is_dvd() && dev->num_parts > 0 &&
27 + dev->part < dev->num_parts) {
28 if (dvd_open_next_part(dcr) < 0) {
29 - Jmsg2(dcr->jcr, M_FATAL, 0, _("Unable to open device next part %s: ERR=%s\n"),
30 - dev->print_name(), strerror_dev(dev));
31 + Jmsg3(dcr->jcr, M_FATAL, 0, _("Unable to open device part=%d %s: ERR=%s\n"),
32 + dev->part, dev->print_name(), strerror_dev(dev));