From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C26441381F3 for ; Wed, 24 Apr 2013 00:40:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35ABCE0AC1; Wed, 24 Apr 2013 00:40:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9FDFFE0AC1 for ; Wed, 24 Apr 2013 00:40:50 +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 9224C33BE52 for ; Wed, 24 Apr 2013 00:40:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 30D3AE408C for ; Wed, 24 Apr 2013 00:40:48 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1366763971.a0960c6567681dae6e5581d580ae510d122ccd82.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: ebuild/dev-python/gobs/files/, ebuild/dev-python/gobs/ X-VCS-Repository: dev/zorry X-VCS-Files: ebuild/dev-python/gobs/Manifest ebuild/dev-python/gobs/files/zobcs_portage_actions.patch X-VCS-Directories: ebuild/dev-python/gobs/files/ ebuild/dev-python/gobs/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: a0960c6567681dae6e5581d580ae510d122ccd82 X-VCS-Branch: master Date: Wed, 24 Apr 2013 00:40:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7afbf2e0-fa1e-4552-a316-5ef6e6840759 X-Archives-Hash: bbf77a8380eadb78532cfaae7324e1c9 commit: a0960c6567681dae6e5581d580ae510d122ccd82 Author: Magnus Granberg gentoo org> AuthorDate: Wed Apr 24 00:39:31 2013 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Wed Apr 24 00:39:31 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=a0960c65 Updated version of the action patch --- ebuild/dev-python/gobs/Manifest | 2 +- .../gobs/files/zobcs_portage_actions.patch | 87 ++++++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletions(-) diff --git a/ebuild/dev-python/gobs/Manifest b/ebuild/dev-python/gobs/Manifest index 600d4b5..4f2301d 100644 --- a/ebuild/dev-python/gobs/Manifest +++ b/ebuild/dev-python/gobs/Manifest @@ -1,5 +1,5 @@ AUX gobs.conf 305 SHA256 fd28bb95af69e507dbb0b9dbcb470eb155e81a97be3cefff9ed241cda766af4a SHA512 838113323adee7d3566714e18ba8af2416f193c2c9bf205af644e541235578107d2a573470d6679bff5e3cce67cb4645a93d38eb8c1b0b6899a22d577d3eb9f9 WHIRLPOOL e84e026def8da0511732be65b3d96fe8a046fd6629b8a914d9669cbbd4e96bd02617ac928cabbe1f3e599a25674037eb948570fa980c5d0451ce7f210166b212 AUX zobcs_portage_Scheduler.patch 2160 SHA256 670caff8033cd0025b1d6de64999960bed694bc4597561f20d5094aebb5a85da SHA512 f7f1c52b050abe48fa546603b8bdff4314ae13c5bde2cf515359199b8d03dca375b2700a085b9edf6021360dbb422039f1cb7f77810894cecc8ff05ca81296d5 WHIRLPOOL bb078bcdd015e618b7d5967746ef094104d352f13a996a2fecf33d3d29292cb37f189fd5ee78f8f7fc34ca819cfb0f9521f8f6802939339179d755e1e3e5e85e -AUX zobcs_portage_actions.patch 2511 SHA256 49379c2de876c575309dc98dbfa0abc9eb95fda399dc17ee6fc563ef74785303 SHA512 99422b461a52f2010f0a1f3f9abc716cb534821c67b93243bbe674d23edff3e3226bf4a7a2b2422ffabd4c293f39baee4b626f24b7f1f03dc8c5486d69f27bb7 WHIRLPOOL 85dd523751774850aa98284bf9ee1fba92b8a0710b6eb9a1dd85b276d9b28ba200fbe8cfcd007fece57e4de14b4036310de07ab93b7ddbd56ddddd024296c633 +AUX zobcs_portage_actions.patch 5402 SHA256 a53e4fd7bbf2c7794a607e2893e9d050039f2a6ae7fa5dcad078f7186a767b2f SHA512 8246979530649343cd8cd2a5519e8a78735b03cbb39c15527f7625211edf706e9e7efd3eabd8420f7673b4217a38b6eb3e38a3e0909088dcbbc709dbbe45bc16 WHIRLPOOL a723330288c1f3ca6a74b80117af190793cbd09d006044a7505a1999d095223e48ecf00e6a6b8ef5e81cf4737d749c1af1633c9945c4403628fcd35b1bde5a01 AUX zobcs_portage_main.patch 1286 SHA256 9ef9c00a761085060b17db6d7afd52dd45a33eab1111d314ad918f7feb70c63c SHA512 50a1a1cc4466139974fd620d1c9a221942e8ce13527402b88553fcc92ef4bbfd9a027ecdb7bdf1d517f49c33e3fb7681e6defc7ecf5329df9a0fcc7681e8cb6c WHIRLPOOL 32f63cd7ca798b6c994a8206ff82c571c099dca93821ebe03f13687a1a4fb40f2eb5522d98365b2b05298651117f64e5a2af6c0920db074791edb492b93eefc2 EBUILD gobs-9999.ebuild 1362 SHA256 412845826806f5e45f02cc3679d4ae4f9a49ae1dbe15d853e1a57ead80f2bf07 SHA512 45bc6b97879b60d2ea32253d4252484a6a8ef2a8faf44b891cb252d3475d99c7bddf445002184629efe1a5b93964382c540292559cbd46bf5433ebc536819ff8 WHIRLPOOL f36d78a44957dbfeebfa9321be0731e60753efd278ffff4f1fab00d9d17f7bba6621920537585be937b9220e54f42c8cd8f64cb9b311c9949d8cc08943cef51a diff --git a/ebuild/dev-python/gobs/files/zobcs_portage_actions.patch b/ebuild/dev-python/gobs/files/zobcs_portage_actions.patch index ba3ee57..2244ae7 100644 --- a/ebuild/dev-python/gobs/files/zobcs_portage_actions.patch +++ b/ebuild/dev-python/gobs/files/zobcs_portage_actions.patch @@ -46,6 +46,93 @@ return 1 mergecount = None +@@ -613,7 +609,7 @@ def action_depclean(settings, trees, ldp + # The calculation is done in a separate function so that depgraph + # references go out of scope and the corresponding memory + # is freed before we call unmerge(). +- rval, cleanlist, ordered, req_pkg_count = \ ++ rval, cleanlist, ordered, req_pkg_count, unresolvable = \ + calc_depclean(settings, trees, ldpath_mtimes, + myopts, action, args_set, spinner) + +@@ -816,7 +812,7 @@ def calc_depclean(settings, trees, ldpat + resolver.display_problems() + + if not success: +- return 1, [], False, 0 ++ return 1, [], False, 0, [] + + def unresolved_deps(): + +@@ -827,7 +823,7 @@ def calc_depclean(settings, trees, ldpat + unresolvable.add((dep.atom, dep.parent.cpv)) + + if not unresolvable: +- return False ++ return None + + if unresolvable and not allow_missing_deps: + +@@ -877,11 +873,12 @@ def calc_depclean(settings, trees, ldpat + "dependencies then use %s." % good("--nodeps")) + writemsg_level("".join("%s%s\n" % (prefix, line) for line in msg), + level=logging.ERROR, noiselevel=-1) +- return True +- return False ++ return unresolvable ++ return None + +- if unresolved_deps(): +- return 1, [], False, 0 ++ unresolvable = unresolved_deps(): ++ if not unresolvable is None: ++ return 1, [], False, 0, unresolvable + + graph = resolver._dynamic_config.digraph.copy() + required_pkgs_total = 0 +@@ -1160,7 +1157,7 @@ def calc_depclean(settings, trees, ldpat + priority=UnmergeDepPriority(runtime=True), + root=pkg.root)): + resolver.display_problems() +- return 1, [], False, 0 ++ return 1, [], False, 0, [] + + writemsg_level("\nCalculating dependencies ") + success = resolver._complete_graph( +@@ -1168,9 +1165,10 @@ def calc_depclean(settings, trees, ldpat + writemsg_level("\b\b... done!\n") + resolver.display_problems() + if not success: +- return 1, [], False, 0 +- if unresolved_deps(): +- return 1, [], False, 0 ++ return 1, [], False, 0, [] ++ unresolvable = unresolved_deps(): ++ if not unresolvable is None: ++ return 1, [], False, 0, unresolvable + + graph = resolver._dynamic_config.digraph.copy() + required_pkgs_total = 0 +@@ -1179,7 +1177,7 @@ def calc_depclean(settings, trees, ldpat + required_pkgs_total += 1 + cleanlist = create_cleanlist() + if not cleanlist: +- return 0, [], False, required_pkgs_total ++ return 0, [], False, required_pkgs_total, [] + clean_set = set(cleanlist) + + if clean_set: +@@ -1289,8 +1287,8 @@ def calc_depclean(settings, trees, ldpat + graph.remove(node) + cleanlist.append(node.cpv) + +- return 0, cleanlist, ordered, required_pkgs_total +- return 0, [], False, required_pkgs_total ++ return 0, cleanlist, ordered, required_pkgs_total, [] ++ return 0, [], False, required_pkgs_total, [] + + def action_deselect(settings, trees, opts, atoms): + enter_invalid = '--ask-enter-invalid' in opts @@ -3508,7 +3504,7 @@ def repo_name_duplicate_check(trees): return bool(ignored_repos)