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

[Michał Górny]

commit:     9f63f0336ec73e876820478d6ad86c5b7cd9a960
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 09:45:52 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 26 09:45:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=9f63f033

Refuse to instantiate non-installed PM.

---
 PMSTestSuite/pm/__init__.py |    3 +++
 ebuild-generator            |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/PMSTestSuite/pm/__init__.py b/PMSTestSuite/pm/__init__.py
index 26efaf7..80e698b 100644
--- a/PMSTestSuite/pm/__init__.py
+++ b/PMSTestSuite/pm/__init__.py
@@ -66,6 +66,9 @@ def get_package_managers():
 
 		def inst(self):
 			""" Instantiate the associated PM. """
+			if not self._pmclass.is_available():
+				raise Exception('PM is not available! Please consider installing %s.'
+						% self._pmclass.pkg)
 			return self._pmclass()
 
 	return [PMWrapper(x) for x in (PortagePM,)]

diff --git a/ebuild-generator b/ebuild-generator
index 4394a0e..1db83ea 100755
--- a/ebuild-generator
+++ b/ebuild-generator
@@ -37,7 +37,10 @@ def main(prog, *args):
 
 	for x in get_package_managers():
 		if x.name == opts.pm:
-			pm = x.inst()
+			try:
+				pm = x.inst()
+			except Exception as e:
+				opt.error(e)
 			break
 	else:
 		opt.error('Package manager not supported: %s' % opts.pm)