Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1A4D9D283 for ; Fri, 14 Sep 2012 18:21:47 +0000 (UTC) Received: (qmail 71464 invoked by uid 500); 14 Sep 2012 18:21:46 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 71440 invoked by uid 500); 14 Sep 2012 18:21:46 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 71433 invoked by uid 99); 14 Sep 2012 18:21:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2012 18:21:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7066636BC2; Fri, 14 Sep 2012 18:21:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: add CentOS 6.3 to cloud-setup-agent Message-Id: <20120914182146.7066636BC2@tyr.zones.apache.org> Date: Fri, 14 Sep 2012 18:21:46 +0000 (UTC) Updated Branches: refs/heads/master 911048929 -> 9cc5c8e46 add CentOS 6.3 to cloud-setup-agent Signed-off-by: Edison Su Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9cc5c8e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9cc5c8e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9cc5c8e4 Branch: refs/heads/master Commit: 9cc5c8e46da841d7ccfba1c9bf91383892948caa Parents: 9110489 Author: Marcus Sorensen Authored: Fri Sep 14 11:21:07 2012 -0700 Committer: Edison Su Committed: Fri Sep 14 11:21:07 2012 -0700 ---------------------------------------------------------------------- python/lib/cloudutils/utilities.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9cc5c8e4/python/lib/cloudutils/utilities.py ---------------------------------------------------------------------- diff --git a/python/lib/cloudutils/utilities.py b/python/lib/cloudutils/utilities.py index 12e9729..adf81fc 100755 --- a/python/lib/cloudutils/utilities.py +++ b/python/lib/cloudutils/utilities.py @@ -106,7 +106,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: + 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") or version.find("CentOS release 6.3") != -1: self.distro = "RHEL6" elif version.find("CentOS release") != -1: self.distro = "CentOS"