From d9398f30704ef2b7d9501666dffd7d991cff4efe Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Fri, 1 Dec 2017 00:36:37 -0500
Subject: [PATCH] More modifications for pr 4386, to deal with the conflicts

---
 xCAT-server/lib/xcat/plugins/openbmc.pm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 2032d63f5..4e0e5cbda 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1782,16 +1782,18 @@ sub deal_with_response {
                 $error = $response_info->{'data'}->{'description'};
             }
         }
-        xCAT::SvrUtils::sendmsg([1, $error], $callback, $node);
-        if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_CHECK_STATE_RESPONSE") {
-            $node_info{$node}{rst} = $error if ($::VERBOSE);
-            my $rflash_log_file = xCAT::Utils->full_path($node.".log", RFLASH_LOG_DIR);
-            open (RFLASH_LOG_FILE_HANDLE, ">> $rflash_log_file");
-            print RFLASH_LOG_FILE_HANDLE "$error\n";
-            close (RFLASH_LOG_FILE_HANDLE);
+        if (!($node_info{$node}{cur_status} eq "RSPCONFIG_DUMP_CLEAR_RESPONSE" and $next_status{ $node_info{$node}{cur_status} })) {
+            xCAT::SvrUtils::sendmsg([1, $error], $callback, $node);
+            if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_CHECK_STATE_RESPONSE") {
+                $node_info{$node}{rst} = $error if ($::VERBOSE);
+                my $rflash_log_file = xCAT::Utils->full_path($node.".log", RFLASH_LOG_DIR);
+                open (RFLASH_LOG_FILE_HANDLE, ">> $rflash_log_file");
+                print RFLASH_LOG_FILE_HANDLE "$error\n";
+                close (RFLASH_LOG_FILE_HANDLE);
+            }
+            $wait_node_num--;
+            return;
         }
-        $wait_node_num--;
-        return;    
     }
 
     if ($status_info{ $node_info{$node}{cur_status} }->{process}) {