incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: refs/heads/master - Have cloud-setup-* tools detect Debian
Date Mon, 25 Feb 2013 07:04:21 GMT
Updated Branches:
  refs/heads/master a4398af35 -> fe9df2186


Have cloud-setup-* tools detect Debian

To minimize this change, treat Debian as Ubuntu for now.

Reviewed-by: Wido (https://reviews.apache.org/r/9310)


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fe9df218
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fe9df218
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fe9df218

Branch: refs/heads/master
Commit: fe9df2186ba3ee1aa787208f4f9c05d9549a3baf
Parents: a4398af
Author: Noa Resare <noa@spotify.com>
Authored: Sat Jan 12 20:34:32 2013 +0000
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Mon Feb 25 12:32:25 2013 +0530

----------------------------------------------------------------------
 debian/control                     |    2 +-
 python/lib/cloudutils/utilities.py |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe9df218/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 380b2e4..e9697ea 100644
--- 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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fe9df218/python/lib/cloudutils/utilities.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/utilities.py b/python/lib/cloudutils/utilities.py
index c9d1e33..739a483 100755
--- a/python/lib/cloudutils/utilities.py
+++ b/python/lib/cloudutils/utilities.py
@@ -122,7 +122,14 @@ class Distribution:
             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
 


Mime
View raw message