From cdd5484814c4284304a551e2353d44fa9729c11c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 May 2023 11:19:23 +0100 Subject: bugfix : https://bugs.redcorelinux.org/show_bug.cgi?id=142 --- src/backend/solvedeps.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/backend/solvedeps.py') diff --git a/src/backend/solvedeps.py b/src/backend/solvedeps.py index 3f2053d..24d4613 100644 --- a/src/backend/solvedeps.py +++ b/src/backend/solvedeps.py @@ -20,6 +20,7 @@ signal.signal(signal.SIGINT, sigint_handler) def start(pkgname=None): bin_list = [] src_list = [] + is_vague = int() need_cfg = int() if pkgname: @@ -35,6 +36,10 @@ def start(pkgname=None): stdout, stderr = p_exe.communicate() for p_out in stderr.decode('utf-8').splitlines(): + if pkgname: + if "The short ebuild name" + " " + ', '.join(f'"{package}"' for package in pkgname) + " " + "is ambiguous." in p_out: + is_vague = int(1) + if any(key in p_out for key in ["The following keyword changes are necessary to proceed:", "The following mask changes are necessary to proceed:", "The following USE changes are necessary to proceed:", @@ -52,11 +57,11 @@ def start(pkgname=None): src_list.append(is_src) if pkgname: - pickle.dump([bin_list, src_list, need_cfg], open(os.path.join( - sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "wb")) + pickle.dump([bin_list, src_list, is_vague, need_cfg], open( + os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "wb")) else: - pickle.dump([bin_list, src_list, need_cfg], open(os.path.join( - sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "wb")) + pickle.dump([bin_list, src_list, is_vague, need_cfg], open( + os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "wb")) except KeyboardInterrupt: p_exe.terminate() try: -- cgit v1.2.3