From 494840581d8cbc99751f2ca452fe120f48746804 Mon Sep 17 00:00:00 2001 From: Peter LaFosse Date: Sat, 2 May 2020 11:03:04 -0400 Subject: Use correct core API for merge_user_analysis --- python/filemetadata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'python') diff --git a/python/filemetadata.py b/python/filemetadata.py index 58afeeec..76cbfe98 100644 --- a/python/filemetadata.py +++ b/python/filemetadata.py @@ -364,8 +364,8 @@ class FileMetadata(object): ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.c_ulonglong, ctypes.c_ulonglong)( lambda ctxt, cur, total: progress_func(cur, total)), clean) - def merge_database(self, path, progress_func = None): - return core.BNMergeUndo(self.handle, str(path), None, + def merge_user_analysis(self, path, progress_func = None): + return core.BNMergeUserAnalysis(self.handle, str(path), None, ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.c_ulonglong, ctypes.c_ulonglong)( lambda ctxt, cur, total: progress_func(cur, total))) -- cgit v1.3.1