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 3CEC4138A1F for ; Sun, 26 Jan 2014 07:31:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 812DEE0BAB; Sun, 26 Jan 2014 07:31:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 104F2E0BAB for ; Sun, 26 Jan 2014 07:31:10 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA5E833EF86 for ; Sun, 26 Jan 2014 07:31:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7DE5418060 for ; Sun, 26 Jan 2014 07:31:08 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1390721429.1dca094d3fada99161e88d1cfc45c20c88483dbe.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/MergeListItem.py pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 1dca094d3fada99161e88d1cfc45c20c88483dbe X-VCS-Branch: master Date: Sun, 26 Jan 2014 07:31:08 +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: b237cb87-876a-4a76-ab9b-551b76f34126 X-Archives-Hash: c00d3c0242f3ed392be34e9531fba783 commit: 1dca094d3fada99161e88d1cfc45c20c88483dbe Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sun Jan 26 07:30:29 2014 +0000 Commit: Arfrever Frehtes Taifersar Arahesis apache org> CommitDate: Sun Jan 26 07:30:29 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1dca094d Fix some DeprecationWarnings. --- pym/_emerge/MergeListItem.py | 14 +++----------- pym/_emerge/actions.py | 6 ------ 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/pym/_emerge/MergeListItem.py b/pym/_emerge/MergeListItem.py index 172dfcc..938f801 100644 --- a/pym/_emerge/MergeListItem.py +++ b/pym/_emerge/MergeListItem.py @@ -1,7 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from portage import os +from portage.dep import _repo_separator from portage.output import colorize from _emerge.AsynchronousTask import AsynchronousTask @@ -59,16 +60,7 @@ class MergeListItem(CompositeTask): (action_desc, colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)), colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval)), - colorize(pkg_color, pkg.cpv)) - - portdb = pkg.root_config.trees["porttree"].dbapi - portdir_repo_name = portdb.getRepositoryName(portdb.porttree_root) - if portdir_repo_name: - pkg_repo_name = pkg.repo - if pkg_repo_name != portdir_repo_name: - if pkg_repo_name == pkg.UNKNOWN_REPO: - pkg_repo_name = "unknown repo" - msg += " from %s" % pkg_repo_name + colorize(pkg_color, pkg.cpv + _repo_separator + pkg.repo)) if pkg.root_config.settings["ROOT"] != "/": msg += " %s %s" % (preposition, pkg.root) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index c401d39..95c5c14 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -3544,12 +3544,6 @@ def repo_name_check(trees): if porttree: portdb = porttree.dbapi missing_repo_names.update(portdb.getMissingRepoNames()) - if portdb.porttree_root in missing_repo_names and \ - not os.path.exists(os.path.join( - portdb.porttree_root, "profiles")): - # This is normal if $PORTDIR happens to be empty, - # so don't warn about it. - missing_repo_names.remove(portdb.porttree_root) # Skip warnings about missing repo_name entries for # /usr/local/portage (see bug #248603).