Have cloud-setup-* tools detect Debian

Noa Resare · yadvr · commit fe9df2186ba3 · 2013-02-25T12:32:25.000+05:30
To minimize this change, treat Debian as Ubuntu for now. Reviewed-by: Wido (https://reviews.apache.org/r/9310)
diff --git a/debian/control b/debian/control
@@ -48,7 +48,7 @@ Description: CloudStack server library
 Package: cloud-scripts
 Replaces: cloud-agent-scripts
 Architecture: any
-Depends: openjdk-6-jre, python, bash, bzip2, gzip, unzip, nfs-common, openssh-client
+Depends: openjdk-6-jre, python, bash, bzip2, gzip, unzip, nfs-common, openssh-client, lsb-release
 Description: CloudStack scripts
  This package contains a number of scripts needed for the CloudStack Agent and Management Server.
  Both the CloudStack Agent and Management server depend on this package
diff --git a/python/lib/cloudutils/utilities.py b/python/lib/cloudutils/utilities.py
@@ -122,7 +122,14 @@ def __init__(self):
             if kernel.find("2.6.32") != -1:
                 self.release = "10.04"
             self.arch = bash("uname -m").getStdout()
-            
+        elif os.path.exists("/usr/bin/lsb_release"):
+            o = bash("/usr/bin/lsb_release -i")
+            distributor = o.getStdout().split(":\t")[1]
+            if "Debian" in distributor:
+                # This obviously needs a rewrite at some point
+                self.distro = "Ubuntu"
+            else:
+                raise UnknownSystemException(distributor)
         else: 
             raise UnknownSystemException
 
