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 21CD31381F3 for ; Fri, 13 Sep 2013 09:15:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00140E0B77; Fri, 13 Sep 2013 09:14:59 +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 8DB72E0B77 for ; Fri, 13 Sep 2013 09:14:59 +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 5EECB33D8A5 for ; Fri, 13 Sep 2013 09:14:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D238DE468F for ; Fri, 13 Sep 2013 09:14:55 +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: <1379063482.1e8c9a72279eeec615a3c25d3fef360888528b8b.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/repository/config.py X-VCS-Directories: pym/portage/repository/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 1e8c9a72279eeec615a3c25d3fef360888528b8b X-VCS-Branch: master Date: Fri, 13 Sep 2013 09:14:55 +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: 8e33ca88-0088-4bf3-8a77-272721044137 X-Archives-Hash: 45eaf3f1f7bf3d38df4adac2910de95c commit: 1e8c9a72279eeec615a3c25d3fef360888528b8b Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Fri Sep 13 09:11:22 2013 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gmail com> CommitDate: Fri Sep 13 09:11:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1e8c9a72 Bug #484730: In sync mode, use repos.conf section name when repo_name file is missing. --- pym/portage/repository/config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 4c4a2eb..6ab3065 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -176,11 +176,11 @@ class RepoConfig(object): missing = True self.name = name if self.location is not None: - if os.path.isdir(location): - eapi = read_corresponding_eapi_file(os.path.join(self.location, REPO_NAME_LOC)) - self.name, missing = self._read_valid_repo_name(self.location) - else: - missing = not portage._sync_disabled_warnings + eapi = read_corresponding_eapi_file(os.path.join(self.location, REPO_NAME_LOC)) + self.name, missing = self._read_valid_repo_name(self.location) + if missing and portage._sync_disabled_warnings: + self.name = name + missing = False elif name == "DEFAULT": missing = False