From: SangYoun Kwak <sy.kwak@samsung.com>
Date: Tue, 23 Apr 2024 02:36:51 +0000 (+0900)
Subject: Fix CreatePatch.py to use ss_bsdiff in the common/bin
X-Git-Tag: accepted/tizen/unified/20240502.044710~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=adf8bd09a92e358c33058de91a294a2678613248;p=platform%2Fcore%2Fsystem%2Fupgrade-tools.git

Fix CreatePatch.py to use ss_bsdiff in the common/bin

In the python script CreatePatch.py, ss_bsdiff is checked whether it is
exist in the /usr/local/bin/ss_bsdiff or not.
If not exist, then it checks if it exists under "../../common/bin".
Script makes new path using statement below:
 > os.path.join("../../common/bin", "/usr/local/bin/ss_bsdiff")
But the return value of the function above is not
 > "../../common/bin/usr/local/bin/ss_bsdiff"
but
 > "/usr/local/bin/ss_bsdiff"
so the script is just checking about "/usr/local/bin/ss_bsdiff" twice.

To fix it, a variable DIFF_UTIL_NAME is added to store the name of the
diff util and check if it exist under "../../common/bin" if
/usr/local/bin/ss_bsdiff is not exist.

Change-Id: I138b54b7dc77a47130435e9034f594b99afa35aa
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>
---

diff --git a/mk_delta/common/bin/CreatePatch.py b/mk_delta/common/bin/CreatePatch.py
index 6443038..2c3baff 100755
--- a/mk_delta/common/bin/CreatePatch.py
+++ b/mk_delta/common/bin/CreatePatch.py
@@ -45,7 +45,8 @@ Catching errors at all stages. SHOULD exit & return error in case of failure
 
 
 COMMON_BIN_PATH = "../../common/bin/"
-DIFF_UTIL = "/usr/local/bin/ss_bsdiff"
+DIFF_UTIL_NAME="ss_bsdiff"
+DIFF_UTIL = "/usr/local/bin/" + DIFF_UTIL_NAME
 ZIPUTIL = "tar -I brotli -cf "
 NEW_FILES_PATH = "run/upgrade-sysroot"
 NEW_FILES_ZIP_NAME = "system.tar.br"
@@ -853,7 +854,7 @@ def main():
 		args.UPDATE_CFG_PATH = os.path.join(PARENT_DIR, args.UPDATE_CFG_PATH)
 
 		if not (os.path.isfile(DIFF_UTIL) and os.access(DIFF_UTIL, os.X_OK)):
-			DIFF_UTIL = os.path.join(COMMON_BIN_PATH, DIFF_UTIL)
+			DIFF_UTIL = os.path.join(COMMON_BIN_PATH, DIFF_UTIL_NAME)
 			if not (os.path.isfile(DIFF_UTIL) and os.access(DIFF_UTIL, os.X_OK)):
 				print("Diff Util Does NOT exist -- ABORT", file=sys.stderr)
 				logging.info('Diff Util Does NOT exist -- ABORT')