Cleanup new timeout code for bconsole

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

diff --git a/bacula/src/dird/ua_purge.c b/bacula/src/dird/ua_purge.c
index d1b6de6191dc0ae40e7164482ce43be9420f2e24..e4cb4288560495a42e71f822bcdeab2d8bdbc807 100644 (file)
--- a/bacula/src/dird/ua_purge.c
+++ b/bacula/src/dird/ua_purge.c
@@ -87,11 +87,11 @@ int purgecmd(UAContext *ua, const char *cmd)
       NULL};
 
    ua->warning_msg(_(
-      "\nThis command is can be DANGEROUS!!!\n\n"
+      "\nThis command can be DANGEROUS!!!\n\n"
       "It purges (deletes) all Files from a Job,\n"
       "JobId, Client or Volume; or it purges (deletes)\n"
       "all Jobs from a Client or Volume without regard\n"
-      "for retention periods. Normally you should use the\n"
+      "to retention periods. Normally you should use the\n"
       "PRUNE command, which respects retention periods.\n"));
 
    if (!open_db(ua)) {
@@ -133,8 +133,6 @@ int purgecmd(UAContext *ua, const char *cmd)
       case 1:                         /* Volume */
          if (select_media_dbr(ua, &mr)) {
             purge_jobs_from_volume(ua, &mr, /*force*/true);
-            
-purge_jobs_from_volume(ua, &mr);
          }
          return 1;
       }
@@ -396,6 +394,7 @@ void upgrade_copies(UAContext *ua, char *jobs)
                    "GROUP BY PriorJobId ",           /* one result per copy */
         JT_JOB_COPY, jobs, jobs);
    db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
+   Dmsg1(050, "Upgrade copies Log sql=%s\n", query.c_str());
 
    /* Now upgrade first copy to Backup */
    Mmsg(query, "UPDATE Job SET Type='B' "           /* JT_JOB_COPY => JT_BACKUP  */
@@ -407,7 +406,6 @@ void upgrade_copies(UAContext *ua, char *jobs)
    db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
 
    db_unlock(ua->db);
-   Dmsg1(00, "Upgrade copies Log sql=%s\n", query.c_str());
 }
 
 /*
@@ -428,7 +426,7 @@ void purge_jobs_from_catalog(UAContext *ua, char *jobs)
    db_sql_query(ua->db, query.c_str(), NULL, (void *)NULL);
    Dmsg1(050, "Delete Log sql=%s\n", query.c_str());
 
-// upgrade_copies(ua, jobs);
+   upgrade_copies(ua, jobs);
 
    /* Now remove the Job record itself */
    Mmsg(query, "DELETE FROM Job WHERE JobId IN (%s)", jobs);