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 A951A107FC for ; Fri, 23 Aug 2013 16:58:11 +0000 (UTC) Received: (qmail 23645 invoked by uid 500); 23 Aug 2013 16:58:11 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 23449 invoked by uid 500); 23 Aug 2013 16:58:07 -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 22627 invoked by uid 99); 23 Aug 2013 16:58:02 -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, 23 Aug 2013 16:58:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 25DA68C3D46; Fri, 23 Aug 2013 16:58: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 Date: Fri, 23 Aug 2013 16:58:45 -0000 Message-Id: <9db507a136b2495882f0b037a259b345@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [45/50] git commit: [#3154] few minor fixes [#3154] few minor fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7a5bf4c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7a5bf4c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7a5bf4c7 Branch: refs/heads/cj/6530 Commit: 7a5bf4c7fba5c573e7d201f5de25172e6c9332d3 Parents: 719f6e9 Author: Dave Brondsema Authored: Wed Aug 21 21:19:04 2013 +0000 Committer: Dave Brondsema Committed: Thu Aug 22 20:49:29 2013 +0000 ---------------------------------------------------------------------- Allura/allura/model/project.py | 2 +- Allura/allura/tasks/export_tasks.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7a5bf4c7/Allura/allura/model/project.py ---------------------------------------------------------------------- diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py index f57dc34..ebccb3d 100644 --- a/Allura/allura/model/project.py +++ b/Allura/allura/model/project.py @@ -887,7 +887,7 @@ class Project(MappedClass, ActivityNode, ActivityObject): export_task = MonQTask.query.get(**q) if not export_task: return - if export_task.state in ('busy', 'ready'): + else: return 'busy' http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7a5bf4c7/Allura/allura/tasks/export_tasks.py ---------------------------------------------------------------------- diff --git a/Allura/allura/tasks/export_tasks.py b/Allura/allura/tasks/export_tasks.py index ee07057..06590021 100644 --- a/Allura/allura/tasks/export_tasks.py +++ b/Allura/allura/tasks/export_tasks.py @@ -77,7 +77,7 @@ def _bulk_export(project, tools, user): zip_and_cleanup(project, export_filename) else: log.error('Nothing to export') - None + return None if not user: log.info('No user. Skipping notification.') @@ -115,8 +115,8 @@ def create_export_dir(project, export_filename): def zip_and_cleanup(project, export_filename): """ - Zip exported data. Copy it to proper location. Remove temporary files. - Returns base filename of zip file + Zip exported data for a given project and filename (no path). + Copy it to proper location. Remove temporary files. """ path = project.bulk_export_path() temp = os.path.join(path, export_filename.split('.')[0])