You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/08/23 18:58:45 UTC
[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 <db...@slashdotmedia.com>
Authored: Wed Aug 21 21:19:04 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
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])