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 78726FE1C for ; Wed, 20 Mar 2013 01:41:21 +0000 (UTC) Received: (qmail 29144 invoked by uid 500); 20 Mar 2013 01:41:18 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 29037 invoked by uid 500); 20 Mar 2013 01:41:18 -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 28762 invoked by uid 99); 20 Mar 2013 01:41:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Mar 2013 01:41:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8329F3D3DF; Wed, 20 Mar 2013 01:41:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] git commit: refs/heads/gslb-wip - cli: cachemaker should import config and not the field Message-Id: <20130320014117.8329F3D3DF@tyr.zones.apache.org> Date: Wed, 20 Mar 2013 01:41:17 +0000 (UTC) cli: cachemaker should import config and not the field Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e28aa09f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e28aa09f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e28aa09f Branch: refs/heads/gslb-wip Commit: e28aa09f01fcaf6abd806ab94d962563e1fba6c2 Parents: 93bc669 Author: Rohit Yadav Authored: Tue Mar 19 15:47:51 2013 +0530 Committer: Rohit Yadav Committed: Tue Mar 19 16:05:11 2013 +0530 ---------------------------------------------------------------------- tools/cli/cloudmonkey/cachemaker.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e28aa09f/tools/cli/cloudmonkey/cachemaker.py ---------------------------------------------------------------------- diff --git a/tools/cli/cloudmonkey/cachemaker.py b/tools/cli/cloudmonkey/cachemaker.py index 42a077a..8ac123c 100644 --- a/tools/cli/cloudmonkey/cachemaker.py +++ b/tools/cli/cloudmonkey/cachemaker.py @@ -21,7 +21,7 @@ try: import os import types - from config import cache_file + from config import config_fields except ImportError, e: import sys print "ImportError", e @@ -168,6 +168,7 @@ def main(json_file): f.close() if __name__ == "__main__": + cache_file = config_fields['core']['cache_file'] print "[cachemaker] Pre-caching using user's cloudmonkey cache", cache_file if os.path.exists(cache_file): main(cache_file)