Changeset 450

Timestamp:

27-09-09 16:21:37 (4 years ago)

Author:

thomas

Message:

• moap/util/distro.py: Add a DistroException?. Raise it when lsb_release is not present (like on the f11 buildslave)

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/util/distro.py (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2009-09-27  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * moap/util/distro.py:
+          Add a DistroException.
+          Raise it when lsb_release is not present (like on the f11
+          buildslave)
+
 2009-09-25  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap/util/distro.py

@@ -12 +12 @@
 Figure out what distribution, architecture and version the user is on.
 """
+
+class DistroException(Exception):
+    pass
 
 class Distro:
@@ -67 +70 @@
     """
     # start with lsb_release
-    output = commands.getoutput("lsb_release -i")
+    (status, output) = commands.getstatusoutput("lsb_release -i")
+    if os.WIFEXITED(status):
+        ret = os.WEXITSTATUS(status)
+        if ret == 127:
+            raise DistroException('lsb_release binary not found')
+
     if output and output.startswith('Distributor ID:'):
         distributor = output.split(':', 2)[1].strip()