[gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/pm/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/pm/
Date: Tue, 21 Jun 2011 20:58:02 +0000 (UTC)	[thread overview]
Message-ID: <37601edef85f1c32c6641089bd74dea886e86306.mgorny@gentoo> (raw)

commit:     37601edef85f1c32c6641089bd74dea886e86306
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 20:58:27 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 20:58:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=37601ede

paludis: don't require python bindings.

---
 PMSTestSuite/pm/paludispm.py |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/PMSTestSuite/pm/paludispm.py b/PMSTestSuite/pm/paludispm.py
index 834a150..3b9effa 100644
--- a/PMSTestSuite/pm/paludispm.py
+++ b/PMSTestSuite/pm/paludispm.py
@@ -20,7 +20,7 @@ class PaludisPM(PackageManager):
 	Requires Paludis with USE=python.
 	"""
 	name = 'paludis'
-	pkg = 'sys-apps/paludis[python]'
+	pkg = 'sys-apps/paludis'
 
 	cave_path = '/usr/bin/cave'
 	common_cave_opts = ['--lazy', '--preserve-world', '--execute']
@@ -33,11 +33,10 @@ class PaludisPM(PackageManager):
 
 	@classmethod
 	def is_available(cls):
-		try:
-			import paludis
-		except ImportError:
-			return False
-		return True
+		p = subprocess.Popen(['cave', '--version'],
+				stdout = subprocess.PIPE, stderr = subprocess.PIPE)
+		p.communicate()
+		return p.wait() == 0
 
 	def _spawn_cave(self, cpvs, action, opts = []):
 		return subprocess.Popen(['cave', '--log-level', 'warning', action]
@@ -60,7 +59,7 @@ class PaludisPM(PackageManager):
 				'--raw-name', 'location',
 				'--format', '%v'], stdout=subprocess.PIPE)
 		r = s.communicate()[0]
-		if not r or s.returncode != 0:
+		if not r or s.wait() != 0:
 			raise KeyError('Repository %s not found.' % name)
 		self._repo_mappings[r] = name
 		return EbuildRepository(r)

next             reply	other threads:[~2011-06-21 20:58 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-21 20:58 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-08-08 21:31 [gentoo-commits] proj/pms-test-suite:master commit in: pmstestsuite/pm/ Michał Górny
2011-08-05 19:54 Michał Górny
2011-08-05 17:09 Michał Górny
2011-08-05 17:09 Michał Górny
2011-08-03 20:17 Michał Górny
2011-08-03 20:17 Michał Górny
2011-07-31 15:10 Michał Górny
2011-06-23  9:51 [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/pm/ Michał Górny
2011-06-23  9:51 Michał Górny
2011-06-23  9:51 Michał Górny
2011-06-23  9:51 Michał Górny
2011-06-21 21:25 Michał Górny
2011-06-21 20:58 Michał Górny
2011-06-21 20:58 Michał Górny
2011-06-21 20:58 Michał Górny
2011-06-21 20:58 Michał Górny
2011-06-21 17:58 Michał Górny
2011-06-21 17:54 Michał Górny
2011-06-21 17:54 Michał Górny
2011-06-21 17:54 Michał Górny
2011-06-21 17:54 Michał Górny
2011-06-21 15:26 Michał Górny
2011-06-21 15:26 Michał Górny
2011-06-20 19:20 Michał Górny
2011-06-16 19:49 Michał Górny
2011-06-16 19:49 Michał Górny
2011-06-14 12:35 Michał Górny
2011-06-07 17:16 Michał Górny
2011-06-07 17:16 Michał Górny
2011-06-07 15:20 Michał Górny
2011-06-07 14:54 Michał Górny
2011-06-06  7:36 Michał Górny
2011-05-31 21:06 Michał Górny
2011-05-31 19:18 Michał Górny
2011-05-31 19:18 Michał Górny
2011-05-31 12:14 Michał Górny
2011-05-31 12:14 Michał Górny
2011-05-29 18:57 Michał Górny
2011-05-29 18:57 Michał Górny
2011-05-26  9:45 Michał Górny
2011-05-25 16:24 Michał Górny
2011-05-25 16:24 Michał Górny

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:834a150 dfblob:3b9effa )
 OR (
bs:"[gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/pm/" )
	(help)

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=37601edef85f1c32c6641089bd74dea886e86306.mgorny@gentoo \
    --to=mgorny@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