public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Brian Dolbec" <dolsen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/
Date: Sun, 15 May 2016 18:34:31 +0000 (UTC)	[thread overview]
Message-ID: <1463336838.2c45b9b37355ee3684a4a6cf732e08b16a5398cb.dolsen@gentoo> (raw)
Message-ID: <20160515183431.QVMInvgbuKtYfBnBHykIKCeV3s7RXzLNmToVJuK0FEk@z> (raw)

commit:     2c45b9b37355ee3684a4a6cf732e08b16a5398cb
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 02:23:46 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> 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


             reply	other threads:[~2016-05-15 18:34 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-15 23:51 Brian Dolbec [this message]
2016-05-15 18:34 ` [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/ Brian Dolbec
  -- strict thread matches above, loose matches on Subject: below --
2016-06-24  6:38 [gentoo-commits] proj/portage:master " Zac Medico
2016-06-28 15:34 Mike Frysinger
2016-06-30  5:54 Michał Górny
2016-09-15 18:46 Brian Dolbec
2016-09-15 18:46 Brian Dolbec
2016-10-11 18:54 Brian Dolbec
2016-12-06  3:54 Brian Dolbec
2017-01-06 17:17 Brian Dolbec
2017-01-06 17:17 Brian Dolbec
2017-01-06 17:17 Brian Dolbec
2017-01-13 17:13 Zac Medico
2017-01-14 14:23 Mike Gilbert
2017-01-14 19:10 Mike Gilbert
2017-03-01 18:40 Brian Dolbec
2017-03-01 19:22 Brian Dolbec
2017-03-15 21:56 Brian Dolbec
2017-07-18 23:08 Brian Dolbec
2017-08-06  6:54 Michał Górny
2018-02-27 19:07 Michał Górny
2018-02-27 19:07 Michał Górny
2018-03-30 17:23 Zac Medico

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1463336838.2c45b9b37355ee3684a4a6cf732e08b16a5398cb.dolsen@gentoo \
    --to=dolsen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox