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 CA1531025A for ; Thu, 30 Jan 2014 23:19:03 +0000 (UTC) Received: (qmail 6142 invoked by uid 500); 30 Jan 2014 23:19:03 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 6119 invoked by uid 500); 30 Jan 2014 23:19:03 -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 6111 invoked by uid 99); 30 Jan 2014 23:19:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jan 2014 23:19:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B72B49169C0; Thu, 30 Jan 2014 23:19:02 +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 Message-Id: <0064be1938b142d9b01ead86f95ab112@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [#7118] Added check for disabled tracker in GitHub import Date: Thu, 30 Jan 2014 23:19:02 +0000 (UTC) Updated Branches: refs/heads/cj/7118 1d8f6c8a0 -> a92b8e004 [#7118] Added check for disabled tracker in GitHub import Signed-off-by: Cory Johns Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a92b8e00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a92b8e00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a92b8e00 Branch: refs/heads/cj/7118 Commit: a92b8e00474ad05dd66d1631a70259cdb6449bba Parents: 1d8f6c8 Author: Cory Johns Authored: Thu Jan 30 23:18:54 2014 +0000 Committer: Cory Johns Committed: Thu Jan 30 23:18:54 2014 +0000 ---------------------------------------------------------------------- ForgeImporters/forgeimporters/github/__init__.py | 3 +++ ForgeImporters/forgeimporters/github/tracker.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a92b8e00/ForgeImporters/forgeimporters/github/__init__.py ---------------------------------------------------------------------- diff --git a/ForgeImporters/forgeimporters/github/__init__.py b/ForgeImporters/forgeimporters/github/__init__.py index 0f17e0b..434e639 100644 --- a/ForgeImporters/forgeimporters/github/__init__.py +++ b/ForgeImporters/forgeimporters/github/__init__.py @@ -173,6 +173,9 @@ class GitHubProjectExtractor(base.ProjectExtractor): def has_wiki(self): return self.get_page('project_info').get('has_wiki') + def has_tracker(self): + return self.get_page('project_info').get('has_issues') + class GitHubOAuthMixin(object): http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a92b8e00/ForgeImporters/forgeimporters/github/tracker.py ---------------------------------------------------------------------- diff --git a/ForgeImporters/forgeimporters/github/tracker.py b/ForgeImporters/forgeimporters/github/tracker.py index fff88f6..4295f2d 100644 --- a/ForgeImporters/forgeimporters/github/tracker.py +++ b/ForgeImporters/forgeimporters/github/tracker.py @@ -115,6 +115,9 @@ class GitHubTrackerImporter(ToolImporter): mount_label=None, **kw): import_id_converter = ImportIdConverter.get() project_name = '%s/%s' % (kw['user_name'], project_name) + extractor = GitHubProjectExtractor(project_name, user=user) + if not extractor.has_tracker(): + return app = project.install_app('tickets', mount_point, mount_label, EnableVoting=False, open_status_names='open', @@ -127,7 +130,6 @@ class GitHubTrackerImporter(ToolImporter): self.github_markdown_converter = GitHubMarkdownConverter( kw['user_name'], project_name) ThreadLocalORMSession.flush_all() - extractor = GitHubProjectExtractor(project_name, user=user) try: M.session.artifact_orm_session._get().skip_mod_date = True with h.push_config(c, user=M.User.anonymous(), app=app):