strcpy(jcr->VolumeName, vol->VolCatName); /* set desired VolumeName */
Dmsg2(200, "do_reqest_vol_info got slot=%d Volume=%s\n",
- vol->Slot, vol->VolCatName);
+ vol->Slot, vol->VolCatName);
return 1;
}
Jmsg0(jcr, M_ERROR, 0, _("NULL Volume name. This shouldn't happen!!!\n"));
return 0;
}
+ bash_spaces(vol->VolCatName);
bnet_fsend(dir, Update_media, jcr->Job,
vol->VolCatName, vol->VolCatJobs, vol->VolCatFiles,
vol->VolCatBlocks, edit_uint64(vol->VolCatBytes, ed1),
vol->VolCatWrites, edit_uint64(vol->VolCatMaxBytes, ed2),
EndTime, vol->VolCatStatus, vol->Slot, relabel);
Dmsg1(120, "update_volume_data(): %s", dir->msg);
+ unbash_spaces(vol->VolCatName);
if (bnet_recv(dir) <= 0) {
Dmsg0(190, "updateVolCatInfo error bnet_recv\n");
Jmsg(jcr, M_ERROR, 0, _("Error updating Volume Info: %s\n"),
* removable media, return now, otherwise wait
* for the operator to mount the media.
*/
- if (jcr->VolumeName[0] && !(dev->capabilities & CAP_REM) &&
- dev->capabilities & CAP_LABEL) {
+ if (jcr->VolumeName[0] && !dev_cap(dev, CAP_REM) && dev_cap(dev, CAP_LABEL)) {
Dmsg0(190, "Return 1 from mount without wait.\n");
return 1;
}