Revert "Fix for purge command not purging and truncating."

This reverts commit dc89f66.
bareos · Feb 27, 2014 · 2ff6f9a · 2ff6f9a
1 parent 8fae4ec
commit 2ff6f9a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/dird/ua_purge.c b/src/dird/ua_purge.c
@@ -141,18 +141,18 @@ int purge_cmd(UAContext *ua, const char *cmd)
       }
    /* Volume */
    case 2:
+      /* Perform ActionOnPurge (action=truncate) */
+      if (find_arg(ua, "action") >= 0) {
+         return action_on_purge_cmd(ua, ua->cmd);
+      }
+
       while ((i=find_arg(ua, NT_("volume"))) >= 0) {
          if (select_media_dbr(ua, &mr)) {
             purge_jobs_from_volume(ua, &mr, /*force*/true);
          }
          *ua->argk[i] = 0;            /* zap keyword already seen */
          ua->send_msg("\n");
       }
-
-      /* Perform ActionOnPurge (action=truncate) */
-      if (find_arg(ua, "action") >= 0) {
-         return action_on_purge_cmd(ua, ua->cmd);
-      }
       return 1;
    /* Quota */
    case 3: