From 7cfceeb91e2d14907cd48226ccc7bcb6df10ee1c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Mar 2018 15:30:43 +0100 Subject: [PATCH] utils/scanpypi: correctly handle license dirs in subdirs for .hash files create_hash_file() used basename(licensefile) when it writes the entry for the license file in the .hash, which is obviously not correct when license file is locate in a sub directory. Instead copy the logic from __create_mk_license() to strip the directory prefix from the absolute filename instead. Signed-off-by: Peter Korsgaard Reviewed-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/scanpypi b/utils/scanpypi index 2b3188dbf6..b9006ee4f7 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -554,7 +554,7 @@ class BuildrootPackage(): hash_line = '{method}\t{digest} {filename}\n'.format( method='sha256', digest=sha256.hexdigest(), - filename=os.path.basename(license_file)) + filename=license_file.replace(self.tmp_extract, '')[1:]) lines.append(hash_line) with open(path_to_hash, 'w') as hash_file: