From 49f0d401d877ce97cd760531619ec765720d14e2 Mon Sep 17 00:00:00 2001 From: Michal Rakowski Date: Tue, 23 Mar 2021 12:34:34 +0100 Subject: [PATCH] Fix for copying pluginObject during copy jobs --- bacula/src/dird/mac.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bacula/src/dird/mac.c b/bacula/src/dird/mac.c index e34f8aa55..e40a13fa6 100644 --- a/bacula/src/dird/mac.c +++ b/bacula/src/dird/mac.c @@ -786,14 +786,14 @@ void mac_cleanup(JCR *jcr, int TermCode, int writeTermCode) db_sql_query(wjcr->db, query.c_str(), NULL, NULL); /* Copy PluginObjects */ - Mmsg(query, "INSERT INTO PluginObject (JobId, Path, Filename, PluginName, ObjectCategory," - "ObjectType, ObjectName, ObjectSource, ObjectUUID, ObjectSize) " - "SELECT %s, Path, Filename, PluginName, ObjectCategory," - "ObjectType, ObjectName, ObjectSource, ObjectUUID, ObjectSize FROM PluginObject WHERE JobId=%s", - new_jobid, old_jobid); - + Mmsg(query, "INSERT INTO Object (JobId, Path, Filename, PluginName, ObjectCategory," + "ObjectType, ObjectName, ObjectSource, ObjectUUID, ObjectSize) " + "SELECT %s, Path, Filename, PluginName, ObjectCategory," + "ObjectType, ObjectName, ObjectSource, ObjectUUID, ObjectSize FROM Object WHERE JobId=%s", + new_jobid, old_jobid); if (!db_sql_query(wjcr->db, query.c_str(), NULL, NULL)) { - Jmsg(jcr, M_WARNING, 0, _("Error copying PluginObject for JobId=%ld"), old_jobid); + Jmsg(jcr, M_WARNING, 0, _("Error copying PluginObject for JobId=%ld: %s"), + old_jobid, db_strerror(jcr->db)); } } -- 2.47.3