Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula/bacula

[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 8bdc1d683c854aba784ff865780047fb52f0544e..ec09f36cdd7ddb4769833cc9c91d28257e15390c 100644 (file)
--- a/bacula/src/dird/ua_purge.c
+++ b/bacula/src/dird/ua_purge.c
@@ -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());
 }
 
 /*