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 D5A4813825A for ; Sun, 15 May 2016 23:51:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16D951430D; Sun, 15 May 2016 23:51:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4148B142A9 for ; Sun, 15 May 2016 23:51:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C4C8340C30 for ; Sun, 15 May 2016 23:51:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAB4B984 for ; Sun, 15 May 2016 23:51:13 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1463336838.2c45b9b37355ee3684a4a6cf732e08b16a5398cb.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: repoman/pym/repoman/metadata.py X-VCS-Directories: repoman/pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 2c45b9b37355ee3684a4a6cf732e08b16a5398cb X-VCS-Branch: master Date: Sun, 15 May 2016 23:51:13 +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: 2d81d51f-f459-48ce-9ecd-b8c0a746c2d8 X-Archives-Hash: 8a74324384c0954ebe26bd46c881d5c7 commit: 2c45b9b37355ee3684a4a6cf732e08b16a5398cb Author: Brian Dolbec gentoo org> AuthorDate: Sun May 15 02:23:46 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun May 15 18:27:18 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2c45b9b3 repoman/metadata.py: Add the local test path to metadata.xsd search This fixes an issue in the travis testing where it tries to download the metadata.xsd which fails. repoman/pym/repoman/metadata.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/repoman/pym/repoman/metadata.py b/repoman/pym/repoman/metadata.py index a9ad3e8..77174f6 100644 --- a/repoman/pym/repoman/metadata.py +++ b/repoman/pym/repoman/metadata.py @@ -108,7 +108,11 @@ def get_metadata_xsd(repo_settings): @returns: path to the metadata.xsd file ''' metadata_xsd = None - for path in reversed(repo_settings.repo_config.eclass_db.porttrees): + paths = list(repo_settings.repo_config.eclass_db.porttrees) + paths.reverse() + # add the test copy + paths.append("/usr/lib/portage/cnf/") + for path in paths: path = os.path.join(path, 'metadata/xml-schema/metadata.xsd') if os.path.exists(path): metadata_xsd = path 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 AC71213825A for ; Sun, 15 May 2016 18:34:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8612314255; Sun, 15 May 2016 18:34:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6C701424B for ; Sun, 15 May 2016 18:34:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C854F340BE3 for ; Sun, 15 May 2016 18:34:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54C1796C for ; Sun, 15 May 2016 18:34:31 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1463336838.2c45b9b37355ee3684a4a6cf732e08b16a5398cb.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: repoman/pym/repoman/metadata.py X-VCS-Directories: repoman/pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 2c45b9b37355ee3684a4a6cf732e08b16a5398cb X-VCS-Branch: repoman Date: Sun, 15 May 2016 18:34:31 +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: de60444a-9663-4df5-9013-9e9949664c05 X-Archives-Hash: 1257977c790fe7f59db0fcc96e7514ef Message-ID: <20160515183431.QVMInvgbuKtYfBnBHykIKCeV3s7RXzLNmToVJuK0FEk@z> commit: 2c45b9b37355ee3684a4a6cf732e08b16a5398cb Author: Brian Dolbec gentoo org> AuthorDate: Sun May 15 02:23:46 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun May 15 18:27:18 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2c45b9b3 repoman/metadata.py: Add the local test path to metadata.xsd search This fixes an issue in the travis testing where it tries to download the metadata.xsd which fails. repoman/pym/repoman/metadata.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/repoman/pym/repoman/metadata.py b/repoman/pym/repoman/metadata.py index a9ad3e8..77174f6 100644 --- a/repoman/pym/repoman/metadata.py +++ b/repoman/pym/repoman/metadata.py @@ -108,7 +108,11 @@ def get_metadata_xsd(repo_settings): @returns: path to the metadata.xsd file ''' metadata_xsd = None - for path in reversed(repo_settings.repo_config.eclass_db.porttrees): + paths = list(repo_settings.repo_config.eclass_db.porttrees) + paths.reverse() + # add the test copy + paths.append("/usr/lib/portage/cnf/") + for path in paths: path = os.path.join(path, 'metadata/xml-schema/metadata.xsd') if os.path.exists(path): metadata_xsd = path