diff --git a/README b/README index e94880b..3ad3ec5 100644 --- a/README +++ b/README @@ -28,6 +28,7 @@ REQUIREMENTS - GStreamer and its python bindings, for encoding - gst-plugins-base >= 0.10.22 for appsink - python musicbrainz2, for metadata lookup +- python-setuptools, for plugin support - python-cddb, for showing but not using disc info if not in musicbrainz - pycdio, for drive identification (optional) diff --git a/bin/rip.in b/bin/rip.in index 1ce5eb9..6bf16ed 100755 --- a/bin/rip.in +++ b/bin/rip.in @@ -34,6 +34,7 @@ try: from morituri.rip import main sys.exit(main.main(sys.argv[1:])) except ImportError, e: - raise - from morituri.util import deps - deps.handleImportError(e) + from morituri.common import deps + h = deps.DepsHandler() + h.handleImportError(e) + sys.exit(1) diff --git a/morituri/common/deps.py b/morituri/common/deps.py index eec409d..ec1062e 100644 --- a/morituri/common/deps.py +++ b/morituri/common/deps.py @@ -14,6 +14,7 @@ class DepsHandler(deps.DepsHandler): self.add(GStPython()) self.add(CDDB()) + self.add(SetupTools()) def report(self, summary): reporter = os.environ.get('EMAIL_ADDRESS', None) @@ -47,3 +48,10 @@ class CDDB(deps.Dependency): return self.Ubuntu_apt('python-cddb') +class SetupTools(deps.Dependency): + module = 'pkg_resources' + name = "python-setuptools" + homepage = "http://pypi.python.org/pypi/setuptools" + + def Fedora_install(self, distro): + return self.Fedora_yum('python-setuptools')