migrate

[bacula/bacula] / bacula / src / dird / autoprune.c

diff --git a/bacula/src/dird/autoprune.c b/bacula/src/dird/autoprune.c
index 663ed00c983bc591dc1b9102ff7c750e8e7e818c..e0214080d93d2f46c993b1d90c8b18bc7ed70666 100644 (file)
--- a/bacula/src/dird/autoprune.c
+++ b/bacula/src/dird/autoprune.c
@@ -1,7 +1,7 @@
 /*
  *
- *   Bacula Director -- Automatic Pruning 
- *     Applies retention periods
+ *   Bacula Director -- Automatic Pruning
+ *      Applies retention periods
  *
  *     Kern Sibbald, May MMII
  *
@@ -45,7 +45,7 @@ int do_autoprune(JCR *jcr)
    CLIENT *client;
    bool pruned;
 
-   if (!jcr->client) {               /* temp -- remove me */
+   if (!jcr->client) {                /* temp -- remove me */
       return 1;
    }
 
@@ -60,7 +60,7 @@ int do_autoprune(JCR *jcr)
    } else {
       pruned = false;
    }
-  
+
    if (jcr->job->PruneFiles || jcr->client->AutoPrune) {
       Jmsg(jcr, M_INFO, 0, _("Begin pruning Files.\n"));
       prune_files(ua, client);
@@ -71,7 +71,7 @@ int do_autoprune(JCR *jcr)
    }
 
    free_ua_context(ua);
-   return 1;   
+   return 1;
 }
 
 /*
@@ -80,7 +80,7 @@ int do_autoprune(JCR *jcr)
  *   volume and no appendable volumes are available.
  *
  *  Return 0: on error
- *        number of Volumes Purged
+ *         number of Volumes Purged
  */
 int prune_volumes(JCR *jcr)
 {
@@ -101,7 +101,7 @@ int prune_volumes(JCR *jcr)
    db_lock(jcr->db);
 
    /* Get the List of all media ids in the current Pool */
-   if (!db_get_media_ids(jcr, jcr->db, jcr->PoolId, &num_ids, &ids)) {
+   if (!db_get_media_ids(jcr, jcr->db, jcr->jr.PoolId, &num_ids, &ids)) {
       Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
       goto bail_out;
    }
@@ -111,21 +111,20 @@ int prune_volumes(JCR *jcr)
       mr.MediaId = ids[i];
       if (!db_get_media_record(jcr, jcr->db, &mr)) {
          Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
-        continue;
+         continue;
       }
       /* Prune only Volumes from current Pool */
-      if (jcr->PoolId != mr.PoolId) {
-        continue;
+      if (jcr->jr.PoolId != mr.PoolId) {
+         continue;
       }
-      /* Prune only Volumes with status "Full", "Used", or "Append" */
-      if (strcmp(mr.VolStatus, "Full")   == 0 || 
-          strcmp(mr.VolStatus, "Append") == 0 ||
+      /* Prune only Volumes with status "Full", or "Used" */
+      if (strcmp(mr.VolStatus, "Full")   == 0 ||
           strcmp(mr.VolStatus, "Used")   == 0) {
          Dmsg1(200, "Prune Volume %s\n", mr.VolumeName);
-        stat += prune_volume(ua, &mr); 
+         stat += prune_volume(ua, &mr);
          Dmsg1(200, "Num pruned = %d\n", stat);
       }
-   }   
+   }
 
 bail_out:
    db_unlock(jcr->db);