- Move test for MaxStartDelay as suggested by Peter.

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

diff --git a/bacula/src/dird/autoprune.c b/bacula/src/dird/autoprune.c
index a7fb458a59f6bb2b0f73ab6a0a5bc42e410e7932..0b7c2a863a7d0976fb05163b3e37a3e27d320272 100644 (file)
--- a/bacula/src/dird/autoprune.c
+++ b/bacula/src/dird/autoprune.c
@@ -1,6 +1,6 @@
 /*
  *
- *   Bacula Director -- Automatic Pruning 
+ *   Bacula Director -- Automatic Pruning
  *     Applies retention periods
  *
  *     Kern Sibbald, May MMII
@@ -9,7 +9,7 @@
  */
 
 /*
-   Copyright (C) 2002 Kern Sibbald and John Walker
+   Copyright (C) 2002-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -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;
 }
 
 /*
@@ -110,7 +110,7 @@ int prune_volumes(JCR *jcr)
    for (i=0; i<num_ids; i++) {
       mr.MediaId = ids[i];
       if (!db_get_media_record(jcr, jcr->db, &mr)) {
-         Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
+        Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
         continue;
       }
       /* Prune only Volumes from current Pool */
@@ -118,14 +118,14 @@ int prune_volumes(JCR *jcr)
         continue;
       }
       /* Prune only Volumes with status "Full", "Used", or "Append" */
-      if (strcmp(mr.VolStatus, "Full")   == 0 || 
-          strcmp(mr.VolStatus, "Append") == 0 ||
-          strcmp(mr.VolStatus, "Used")   == 0) {
-         Dmsg1(200, "Prune Volume %s\n", mr.VolumeName);
-        stat += prune_volume(ua, &mr); 
-         Dmsg1(200, "Num pruned = %d\n", stat);
+      if (strcmp(mr.VolStatus, "Full")   == 0 ||
+         strcmp(mr.VolStatus, "Append") == 0 ||
+         strcmp(mr.VolStatus, "Used")   == 0) {
+        Dmsg1(200, "Prune Volume %s\n", mr.VolumeName);
+        stat += prune_volume(ua, &mr);
+        Dmsg1(200, "Num pruned = %d\n", stat);
       }
-   }   
+   }
 
 bail_out:
    db_unlock(jcr->db);