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 EBB1C1381F3 for ; Tue, 25 Jun 2013 18:50:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5608CE086D; Tue, 25 Jun 2013 18:50:22 +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 E4AA1E086D for ; Tue, 25 Jun 2013 18:50:21 +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 C61CD33DF3D for ; Tue, 25 Jun 2013 18:50:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 617C6E468F for ; Tue, 25 Jun 2013 18:50:19 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1372186201.8403b5434c3b7c9e383a16f3d4f6619efacda385.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8403b5434c3b7c9e383a16f3d4f6619efacda385 X-VCS-Branch: master Date: Tue, 25 Jun 2013 18:50:19 +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: 4eb6bf95-b367-4eee-8a75-c83ecfee408e X-Archives-Hash: fca1b331d83489404dd84bfd097efe81 commit: 8403b5434c3b7c9e383a16f3d4f6619efacda385 Author: Zac Medico gentoo org> AuthorDate: Tue Jun 25 18:50:01 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jun 25 18:50:01 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8403b543 repoman: canonical path for repo location compare --- bin/repoman | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/bin/repoman b/bin/repoman index 2a3b4f3..60286db 100755 --- a/bin/repoman +++ b/bin/repoman @@ -582,8 +582,9 @@ if options.mode == 'commit' and not options.pretend and not vcs: options.pretend = True # Ensure that current repository is in the list of enabled repositories. +repodir = os.path.realpath(portdir_overlay) try: - repoman_settings.repositories.get_repo_for_location(portdir_overlay) + repoman_settings.repositories.get_repo_for_location(repodir) except KeyError: repo_name = portage.repository.config.RepoConfig._read_valid_repo_name(portdir_overlay)[0] layout_conf_data = portage.repository.config.parse_layout_conf(portdir_overlay)[0] @@ -607,22 +608,14 @@ portdb = trees[root]['porttree'].dbapi # Constrain dependency resolution to the master(s) # that are specified in layout.conf. -repodir = os.path.realpath(portdir_overlay) repo_config = repoman_settings.repositories.get_repo_for_location(repodir) portdb.porttrees = list(repo_config.eclass_db.porttrees) portdir = portdb.porttrees[0] commit_env = os.environ.copy() # list() is for iteration on a copy. for repo in list(repoman_settings.repositories): - found = False - for location in [portdir_overlay] + [x.location for x in repo_config.masters]: - try: - if os.path.samefile(location, repo.location): - found = True - break - except OSError: - pass - if not found: + # all paths are canonical + if repo.location not in [repodir] + [x.location for x in repo_config.masters]: del repoman_settings.repositories[repo.name] if repo_config.allow_provide_virtual: