Merge pull request #1700 from greenbone/mergify/bp/master/pr-1695

Consider interrupted status when resuming a task. (backport #1695)
greenbone · Oct 12, 2021 · 96b48e1 · 96b48e1
2 parents f9bfdbf + 0dd50d9
commit 96b48e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,7 +39,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Deprecated
 ### Removed
 ### Fixed
-- Fix resume task. [#1679](https://github.com/greenbone/gvmd/pull/1679)
+- Ensure gvmd sends error messages if gvmcg fails [#1682](https://github.com/greenbone/gvmd/pull/1682)
+- Fix resume task.
+  [#1679](https://github.com/greenbone/gvmd/pull/1679)
+  [#1695](https://github.com/greenbone/gvmd/pull/1695)
 - Added a dedicated error message for the create ticket dialogue when the create permission permission is missing [#1686](https://github.com/greenbone/gvmd/pull/1686)
 - Fix import of report results / errors without host [#1687](https://github.com/greenbone/gvmd/pull/1687)
 

diff --git a/src/manage.c b/src/manage.c
@@ -2217,9 +2217,11 @@ prepare_osp_scan_for_resume (task_t task, const char *scan_id, char **error)
       trim_partial_report (global_current_report);
       return 1;
     }
-  else if (status == OSP_SCAN_STATUS_STOPPED)
+  else if (status == OSP_SCAN_STATUS_STOPPED
+           || status == OSP_SCAN_STATUS_INTERRUPTED)
     {
-      g_debug ("%s: Scan %s stopped", __func__, scan_id);
+      g_debug ("%s: Scan %s stopped or interrupted",
+               __func__, scan_id);
       if (osp_delete_scan (connection, scan_id))
         {
           *error = g_strdup ("Failed to delete old report");