From 48f977736dc2d3dd706383ef771efe7e0aca9eff Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@163.com>
Date: Sun, 11 Aug 2024 11:07:22 +0800
Subject: [PATCH] fix

---
 pywxdump/wx_core/merge_db.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pywxdump/wx_core/merge_db.py b/pywxdump/wx_core/merge_db.py
index 870145a..0fab07f 100644
--- a/pywxdump/wx_core/merge_db.py
+++ b/pywxdump/wx_core/merge_db.py
@@ -444,10 +444,9 @@ def merge_real_time_db(key, merge_path: str, db_paths: [dict] or dict, real_time
     if out and out.decode("utf-8").find("SUCCESS") >= 0:
         wx_core_loger.info(f"合并实时数据库成功{out}")
         return True, merge_path
-    if err:
+    else:
         wx_core_loger.error(f"合并实时数据库失败\n{out}\n{err}")
-        return False, err
-    return False, "未知错误"
+        return False, (out, err)
 
 
 @wx_core_error