Changeset 250 for trunk/moap/util/distro.py

Timestamp:

25-05-07 15:27:31 (6 years ago)

Author:

thomas

Message:

• moap/util/deps.py:
• moap/util/distro.py: Rewrite Distro class. Rewrite code to use lsb_release, seems more generic.

File:

• trunk/moap/util/distro.py (modified) (3 diffs)

trunk/moap/util/distro.py

@@ -2 +2 @@
 # vi:si:et:sw=4:sts=4:ts=4
 
+import commands
 import os
-import re
 
 import distutils.version
@@ -15 +15 @@
 class Distro:
     """
-    @cvar tag:     a short lower-case identifier for the distro
-    @type tag:     str
-    @cvar name:    a longer human-readable name for the distro
-    @type name:    str
-    @cvar version: the version of the distro
-    @type version: str
-    @cvar arch:    the architecture of the distro
-    @type arch:    str
+    @cvar description: a longer human-readable name for the distro
+    @type description: str
+    @cvar distributor: a short lower-case identifier for the distro
+    @type distributor: str
+    @cvar release:     the version of the distro
+    @type release:     str
+    @cvar arch:        the architecture of the distro
+    @type arch:        str
     """
-    tag = None
-    name = None
-    version = None
+    description = None
+    distributor = None
+    release = None
     arch = None
 
-    def __init__(self, tag, name, version, arch):
-        self.tag = tag
-        self.name = name
-        self.version = version
+    def __init__(self, description, distributor, release, arch):
+        self.description = description
+        self.distributor = distributor
+        self.release = release
         self.arch = arch
 
-    def atLeast(self, version):
+    def atLeast(self, release):
         """
-        @param version: version to compare with
-        @type version:  str
+        @param release: release to compare with
+        @type  release:  str
 
-        Returns: whether the distro is at least as new as the given version,
+        Returns: whether the distro is at least as new as the given release,
                  taking non-numbers into account.
         """
-        mine = distutils.version.LooseVersion(self.version)
-        theirs = distutils.version.LooseVersion(version)
+        mine = distutils.version.LooseVersion(self.release)
+        theirs = distutils.version.LooseVersion(release)
         return mine >= theirs
 
@@ -66 +66 @@
     rtype: L{Distro} or None.
     """
-# note: keep redhat-release towards the end, since mandrake has it too (sic)
-# it's a tuple of tuples so we conserve the order
-    mappings = (
-        ('/etc/fedora-release',        'fedora'),
-        ('/etc/mandrake-release',      'mandriva'),
-        ('/etc/mandriva-release',      'mandriva'),
-        ('/etc/mandrakelinux-release', 'mandriva'),
-        ('/etc/SuSE-release',          'suse'),
-        ('/etc/novell-release',        'suse'),
-        ('/etc/redhat-release',        'redhat'),
-        ('/etc/debian_version',        'debian'),
-        ('/etc/netware-release',       'netware'),
-        ('/etc/slackware-version',     'slackware'),
-        ('/etc/yellowdog-release',     'yellowdog'),
-    )
+    # start with lsb_release
+    output = commands.getoutput("lsb_release -i")
+    if output and output.startswith('Distributor ID:'):
+        distributor = output.split(':', 2)[1].strip()
+        output = commands.getoutput("lsb_release -d")
+        description = output.split(':', 2)[1].strip()
+        output = commands.getoutput("lsb_release -r")
+        release = output.split(':', 2)[1].strip()
 
-    for path, distro in mappings:
-        if os.path.exists(path):
-            log.debug('distro', "Found release file %s" % path)
-            h = open(path)
-            contents = h.read()
-            h.close()
-            version = None
-            f = '_%s_getNameVersionFromRelease' % distro
-            if f in globals().keys():
-                log.debug('distro', "Found version function %r" % f)
-                name, version = globals()[f](contents)
-                return Distro(distro, name, version, None)
-
-    return None
-
-# distro-specific name and version getters
-# each getter should return a list of [full name, version]
-def _fedora_getNameVersionFromRelease(contents):
-    matcher = re.compile("^(Fedora Core) release (\d+) .*")
-    m = matcher.search(contents)
-    if m:
-        log.debug('distro', "Found fedora version")
-        return (m.expand("\\1"), m.expand("\\2"))
-
-    log.debug('distro', "Did not find fedora version")
-    return None
+        return Distro(description, distributor, release, None)