Updated Branches: refs/heads/4.1 c25d60f17 -> e33ab6e12
CLOUDSTACK-1642: Add support CentOS 6.4 Fix the test string to match against "CentOS 6.x" Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e33ab6e1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e33ab6e1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e33ab6e1 Branch: refs/heads/4.1 Commit: e33ab6e126d82fd71ba115001ab7c566822713ce Parents: c25d60f Author: Hiroaki KAWAI <[email protected]> Authored: Tue Mar 26 13:16:37 2013 +0900 Committer: Hiroaki KAWAI <[email protected]> Committed: Tue Mar 26 13:25:39 2013 +0900 ---------------------------------------------------------------------- python/lib/cloudutils/utilities.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e33ab6e1/python/lib/cloudutils/utilities.py ---------------------------------------------------------------------- diff --git a/python/lib/cloudutils/utilities.py b/python/lib/cloudutils/utilities.py index 739a483..f7f25f4 100755 --- a/python/lib/cloudutils/utilities.py +++ b/python/lib/cloudutils/utilities.py @@ -110,7 +110,7 @@ class Distribution: self.distro = "Fedora" elif os.path.exists("/etc/redhat-release"): version = file("/etc/redhat-release").readline() - if version.find("Red Hat Enterprise Linux Server release 6") != -1 or version.find("Scientific Linux release 6") != -1 or version.find("CentOS Linux release 6") != -1 or version.find("CentOS release 6.2") != -1 or version.find("CentOS release 6.3") != -1: + if version.find("Red Hat Enterprise Linux Server release 6") != -1 or version.find("Scientific Linux release 6") != -1 or version.find("CentOS Linux release 6") != -1 or version.find("CentOS release 6.") != -1: self.distro = "RHEL6" elif version.find("CentOS release") != -1: self.distro = "CentOS"
