1 Index: src/dird/next_vol.c
2 ===================================================================
3 --- src/dird/next_vol.c (revision 7148)
4 +++ src/dird/next_vol.c (working copy)
8 Dmsg0(150, "Call prune_volumes\n");
9 - prune_volumes(jcr, InChanger, mr);
10 + ok = prune_volumes(jcr, InChanger, mr);
12 - ok = recycle_oldest_purged_volume(jcr, InChanger, mr);
13 - if (!ok && create) {
14 - Dmsg4(050, "after prune volumes_vol ok=%d index=%d InChanger=%d Vstat=%s\n",
15 - ok, index, InChanger, mr->VolStatus);
17 - * 5. Try pulling a volume from the Scratch pool
19 - ok = get_scratch_volume(jcr, InChanger, mr);
22 - * If we are using an Autochanger and have not found
23 - * a volume, retry looking for any volume.
28 - continue; /* retry again accepting any volume */
33 + ok = recycle_oldest_purged_volume(jcr, InChanger, mr);
34 + if (!ok && create) {
35 + Dmsg4(050, "after prune volumes_vol ok=%d index=%d InChanger=%d Vstat=%s\n",
36 + ok, index, InChanger, mr->VolStatus);
38 + * 5. Try pulling a volume from the Scratch pool
40 + ok = get_scratch_volume(jcr, InChanger, mr);
41 + Dmsg4(050, "after get scratch volume ok=%d index=%d InChanger=%d Vstat=%s\n",
42 + ok, index, InChanger, mr->VolStatus);
45 + * If we are using an Autochanger and have not found
46 + * a volume, retry looking for any volume.
48 + if (!ok && InChanger) {
50 + continue; /* retry again accepting any volume */