Changeset 204

Timestamp:

22-04-07 22:20:09 (6 years ago)

Author:

thomas

Message:

• moap/main.py (main): Handle import errors.
• moap/util/deps.py (Dependency, Dependency.install, RDF, RDF.fedora_install, genshi, genshi.fedora_install, handleImportError): Flesh out dependency checking code more, using the new distro code.
• moap/util/Makefile.am:
• moap/util/distro.py (Distro, Distro.init, getSysName, getMachine, getDistroFromRelease, _fedora_getVersionFromRelease): Add a distro module to figure out what distro we're on, inspired by codeina.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/main.py (modified) (2 diffs)
• moap/util/Makefile.am (modified) (1 diff)
• moap/util/deps.py (modified) (2 diffs)
• moap/util/distro.py (added)

trunk/ChangeLog

@@ +1 @@
+2007-04-22  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * moap/main.py (main):
+          Handle import errors.
+        * moap/util/deps.py (Dependency, Dependency.install, RDF,
+          RDF.fedora_install, genshi, genshi.fedora_install,
+          handleImportError):
+          Flesh out dependency checking code more, using the new distro code.
+        * moap/util/Makefile.am:
+        * moap/util/distro.py (Distro, Distro.__init__, getSysName, getMachine,
+          getDistroFromRelease, _fedora_getVersionFromRelease):
+          Add a distro module to figure out what distro we're on, inspired
+          by codeina.
+
 2007-04-22  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap/main.py

@@ -6 +6 @@
 from moap.command import doap, cl, ignore, bug, code
 
-from moap.util import log, util
+from moap.util import log, util, deps
 
 def main(argv):
@@ -15 +15 @@
         sys.stderr.write('moap: error: %s\n' % e.args)
         return 255
+    except ImportError, e:
+        deps.handleImportError(e)
+        ret = -1
 
     if ret is None:

trunk/moap/util/Makefile.am

@@ -6 +6 @@
         ctags.py \
         deps.py \
+        distro.py \
         log.py \
         mail.py \

trunk/moap/util/deps.py

@@ -5 +5 @@
 # missing dependency
 
+from moap.util import distro
+
 import sys
 
-deps = {}
-deps['RDF'] = (
-    "Redland RDF Python Bindings",
-    "http://librdf.org/docs/python.html"
-)
+class Dependency:
+    module = None
+    name = None
+    homepage = None
+
+    def install(self, distro):
+        """
+        Return an explanation on how to install the given dependency
+        for the given distro/version/arch.
+
+        @rtype:   str or None
+        @returns: an explanation on how to install the dependency, or None.
+        """
+        name = distro.tag + '_install'
+        m = getattr(self, name, None)
+        if m:
+            return m(distro)
+
+
+class RDF(Dependency):
+    module = 'RDF'
+    name = "Redland RDF Python Bindings"
+    homepage = "http://librdf.org/docs/python.html"
+
+    def fedora_install(self, distro):
+        if distro.version >= '5':
+            return "You can install RDF on Fedora with:\n" \
+                "su -c \"yum install python-redland\" -"
+
+        return "Your version of Fedora does not have python-redland available."
+
+
+class genshi(Dependency):
+    module = 'genshii'
+    name = "Genshi templating language"
+    homepage = "http://genshi.edgewall.com/"
+
+    def fedora_install(self, distro):
+        return "genshi is not yet available in Fedora Extras.\n"
 
 def handleImportError(exception):
@@ -22 +58 @@
         raise
     module = first[len('No module named '):]
+    module = module.split('.')[0]
+    deps = {}
+    for dep in [RDF(), genshi()]:
+        deps[dep.module] = dep
+
     if module in deps.keys():
         dep = deps[module]
-        sys.stderr.write('Could not import %s\n' % module)
-        sys.stderr.write('This module is part of %s.\n' % dep[0])
-        sys.stderr.write('Please install it and try again.\n')
+        sys.stderr.write("Could not import python module '%s'\n" % module)
+        sys.stderr.write('This module is part of %s.\n' % dep.name)
+        if dep.homepage:
+            sys.stderr.write('See %s for more information.\n\n' % dep.homepage)
+
+        d = distro.getDistroFromRelease()
+        if d:
+            howto = dep.install(d)
+            if howto:
+                sys.stderr.write(howto)
+            else:
+                sys.stderr.write(
+                    "On %s, MOAP does not know how to install %s.\n" 
+                    "Please file a bug so we can add this dependency.\n" % (
+                        d.name, dep.module))
+        else:
+            sys.stderr.write("""MOAP does not know your distribution.
+Please file a bug so we can add your distribution.
+""")
+
+        sys.stderr.write('\n')
+
+        sys.stderr.write('Please install %s and try again.\n' % module)
         sys.stderr.write(
             'You can confirm it is installed by starting Python and running:\n')
         sys.stderr.write('import %s\n' % module)
-        sys.stderr.write('More information is at %s\n' % dep[1])
+
+
         return