From 1c04bb63f3e0aa939c9b0549daae39f66047025a Mon Sep 17 00:00:00 2001 From: Jakub Hradil Date: Tue, 25 Feb 2014 11:30:50 +0100 Subject: [PATCH] Fix for purge command not purging and truncating volumes when run with action parameter --- src/dird/ua_purge.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dird/ua_purge.c b/src/dird/ua_purge.c index 865eaca..44d5473 100644 --- a/src/dird/ua_purge.c +++ b/src/dird/ua_purge.c @@ -141,11 +141,6 @@ 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); @@ -153,6 +148,11 @@ int purge_cmd(UAContext *ua, const char *cmd) *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: -- 1.8.5.3