From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SjtOr-0004Vb-F6 for garchives@archives.gentoo.org; Wed, 27 Jun 2012 14:39:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A39EBE02F0; Wed, 27 Jun 2012 14:39:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6415BE02F0 for ; Wed, 27 Jun 2012 14:39:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D1DA1B46B2 for ; Wed, 27 Jun 2012 14:39:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 31D1EE5432 for ; Wed, 27 Jun 2012 14:39:01 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1340807928.541e65103ae30fbf83a7d49ff6a05205a069e9e2.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: gobs/pym/ X-VCS-Repository: dev/zorry X-VCS-Files: gobs/pym/build_queru.py X-VCS-Directories: gobs/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 541e65103ae30fbf83a7d49ff6a05205a069e9e2 X-VCS-Branch: master Date: Wed, 27 Jun 2012 14:39:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 06d695c7-9a4a-47f3-8c8f-f377d8d5eaf0 X-Archives-Hash: 70bef39dcf6c9f2a8bef6bf85dd09c5d commit: 541e65103ae30fbf83a7d49ff6a05205a069e9e2 Author: Magnus Granberg gentoo org> AuthorDate: Wed Jun 27 14:38:48 2012 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Wed Jun 27 14:38:48 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/zorry.git;a=3D= commit;h=3D541e6510 fix for depgraph --- gobs/pym/build_queru.py | 98 +++++++++++++++++++++++------------------= ----- 1 files changed, 49 insertions(+), 49 deletions(-) diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py index 068c879..3d2ef11 100644 --- a/gobs/pym/build_queru.py +++ b/gobs/pym/build_queru.py @@ -150,57 +150,57 @@ class queruaction(object): root_config =3D trees[settings["ROOT"]]["root_config"] display_missing_pkg_set(root_config, e.value) build_dict['type_fail'] =3D "depgraph fail" - if not success: - if mydepgraph._dynamic_config._needed_p_mask_changes: - build_dict['type_fail'] =3D "Mask packages" - build_dict['check_fail'] =3D True - mydepgraph.display_problems() - self.log_fail_queru(build_dict, settings) - return 1, settings, trees, mtimedb - if mydepgraph._dynamic_config._needed_use_config_changes: - repeat =3D True - repeat_times =3D 0 - while repeat: - mydepgraph._display_autounmask() - settings, trees, mtimedb =3D load_emerge_config() - myparams =3D create_depgraph_params(myopts, myaction) - try: - success, mydepgraph, favorites =3D backtrack_depgraph( - settings, trees, myopts, myparams, myaction, myfiles, spinner) - except portage.exception.PackageSetNotFound as e: - root_config =3D trees[settings["ROOT"]]["root_config"] - display_missing_pkg_set(root_config, e.value) - if not success and mydepgraph._dynamic_config._needed_use_config_c= hanges: - print("repaet_times:", repeat_times) - if repeat_times is 2: - build_dict['type_fail'] =3D "Need use change" - build_dict['check_fail'] =3D True - mydepgraph.display_problems() - repeat =3D False - repeat =3D False - else: - repeat_times =3D repeat_times + 1 - else: + if not success: + if mydepgraph._dynamic_config._needed_p_mask_changes: + build_dict['type_fail'] =3D "Mask packages" + build_dict['check_fail'] =3D True + mydepgraph.display_problems() + self.log_fail_queru(build_dict, settings) + return 1, settings, trees, mtimedb + if mydepgraph._dynamic_config._needed_use_config_changes: + repeat =3D True + repeat_times =3D 0 + while repeat: + mydepgraph._display_autounmask() + settings, trees, mtimedb =3D load_emerge_config() + myparams =3D create_depgraph_params(myopts, myaction) + try: + success, mydepgraph, favorites =3D backtrack_depgraph( + settings, trees, myopts, myparams, myaction, myfiles, spinner) + except portage.exception.PackageSetNotFound as e: + root_config =3D trees[settings["ROOT"]]["root_config"] + display_missing_pkg_set(root_config, e.value) + if not success and mydepgraph._dynamic_config._needed_use_config_ch= anges: + print("repaet_times:", repeat_times) + if repeat_times is 2: + build_dict['type_fail'] =3D "Need use change" + build_dict['check_fail'] =3D True + mydepgraph.display_problems() repeat =3D False + repeat =3D False + else: + repeat_times =3D repeat_times + 1 + else: + repeat =3D False + + if mydepgraph._dynamic_config._unsolvable_blockers: + mydepgraph.display_problems() + build_dict['type_fail'] =3D "Blocking packages" + build_dict['check_fail'] =3D True + self.log_fail_queru(build_dict, settings) + return 1, settings, trees, mtimedb =20 - if mydepgraph._dynamic_config._unsolvable_blockers: - mydepgraph.display_problems() - build_dict['type_fail'] =3D "Blocking packages" - build_dict['check_fail'] =3D True - self.log_fail_queru(build_dict, settings) - return 1, settings, trees, mtimedb - - if mydepgraph._dynamic_config._slot_collision_info: - mydepgraph.display_problems() - build_dict['type_fail'] =3D "Slot blocking" - build_dict['check_fail'] =3D True - self.log_fail_queru(build_dict, settings) - return 1, settings, trees, mtimedb - - if not success: - build_dict['type_fail'] =3D "Dep calc fail" - build_dict['check_fail'] =3D True - mydepgraph.display_problems() + if mydepgraph._dynamic_config._slot_collision_info: + mydepgraph.display_problems() + build_dict['type_fail'] =3D "Slot blocking" + build_dict['check_fail'] =3D True + self.log_fail_queru(build_dict, settings) + return 1, settings, trees, mtimedb + + if not success: + build_dict['type_fail'] =3D "Dep calc fail" + build_dict['check_fail'] =3D True + mydepgraph.display_problems() =20 if build_dict['check_fail'] is True: self.log_fail_queru(build_dict, settings)