Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-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 BE859D258 for ; Mon, 4 Feb 2013 21:27:05 +0000 (UTC) Received: (qmail 72707 invoked by uid 500); 4 Feb 2013 21:27:05 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 72654 invoked by uid 500); 4 Feb 2013 21:27:05 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 72543 invoked by uid 99); 4 Feb 2013 21:27:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2013 21:27:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 34A6B829E32; Mon, 4 Feb 2013 21:27:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/16] git commit: [#4943] ticket:259 * added exc_info=True to log.info * refactored install_anchored_tools Message-Id: <20130204212705.34A6B829E32@tyr.zones.apache.org> Date: Mon, 4 Feb 2013 21:27:05 +0000 (UTC) [#4943] ticket:259 * added exc_info=True to log.info * refactored install_anchored_tools Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/145ed5af Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/145ed5af Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/145ed5af Branch: refs/heads/cj/5705 Commit: 145ed5afb4ed5f5de90fe99acea98bd16ada1aca Parents: b58e89d Author: Yuriy Arhipov Authored: Tue Jan 22 08:51:05 2013 +0400 Committer: Dave Brondsema Committed: Thu Jan 31 20:26:30 2013 +0000 ---------------------------------------------------------------------- Allura/allura/model/neighborhood.py | 1 + Allura/allura/model/project.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/145ed5af/Allura/allura/model/neighborhood.py ---------------------------------------------------------------------- diff --git a/Allura/allura/model/neighborhood.py b/Allura/allura/model/neighborhood.py index d22064a..c572ce6 100644 --- a/Allura/allura/model/neighborhood.py +++ b/Allura/allura/model/neighborhood.py @@ -244,4 +244,5 @@ class Neighborhood(MappedClass): try: return OrderedDict((tool.split(':')[0].lower(), tool.split(':')[1]) for tool in anchored_tools) except Exception: + log.info("anchored_tools isn't valid", exc_info=True) return dict() http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/145ed5af/Allura/allura/model/project.py ---------------------------------------------------------------------- diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py index be121df..f12673f 100644 --- a/Allura/allura/model/project.py +++ b/Allura/allura/model/project.py @@ -445,10 +445,10 @@ class Project(MappedClass, ActivityNode, ActivityObject): installed_tools = [tool.tool_name.lower() for tool in self.app_configs] i = 0 if not self.is_nbhd_project: - for tool in anchored_tools.keys(): + for tool, label in anchored_tools.iteritems(): if tool not in installed_tools: try: - self.install_app(tool, tool, anchored_tools[tool], i) + self.install_app(tool, tool, label, i) except Exception: log.error('%s is not available' % tool, exc_info=True) i += 1