You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2014/01/09 18:55:13 UTC
[3/6] git commit: [#6905] ticket:503 added new index for sort tasks
in monqtask collection. fixed issue related to posibility to download not
complete snapshot
[#6905] ticket:503 added new index for sort tasks in monqtask collection. fixed issue related to posibility to download not complete snapshot
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/dd3c0080
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/dd3c0080
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/dd3c0080
Branch: refs/heads/tv/6905
Commit: dd3c0080d5524fd2b9e6ad0c9e68f007a7de80cf
Parents: 6df4a87
Author: Mykola Kharechko <cr...@gmail.com>
Authored: Wed Jan 8 11:13:33 2014 +0200
Committer: Mykola Kharechko <cr...@gmail.com>
Committed: Wed Jan 8 12:09:22 2014 +0200
----------------------------------------------------------------------
Allura/allura/model/monq_model.py | 1 +
Allura/allura/tasks/repo_tasks.py | 2 +-
Allura/allura/templates/repo/tarball.html | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dd3c0080/Allura/allura/model/monq_model.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/monq_model.py b/Allura/allura/model/monq_model.py
index f38c073..7e25f38 100644
--- a/Allura/allura/model/monq_model.py
+++ b/Allura/allura/model/monq_model.py
@@ -81,6 +81,7 @@ class MonQTask(MappedClass):
'kwargs.revision', 'kwargs.path'
],
'args',
+ 'time_queue',
]
_id = FieldProperty(S.ObjectId)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dd3c0080/Allura/allura/tasks/repo_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/repo_tasks.py b/Allura/allura/tasks/repo_tasks.py
index c4b9296..0354eb9 100644
--- a/Allura/allura/tasks/repo_tasks.py
+++ b/Allura/allura/tasks/repo_tasks.py
@@ -132,7 +132,7 @@ def tarball(revision=None, path=None):
else:
try:
repo.tarball(revision, path)
- except:
+ finally:
log.error('Could not create snapshot for repository: %s:%s revision %s path %s' % (c.project.shortname, c.app.config.options.mount_point, revision, path), exc_info=True)
else:
log.warn('Skipped creation of snapshot: %s:%s because revision is not specified' % (c.project.shortname, c.app.config.options.mount_point))
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dd3c0080/Allura/allura/templates/repo/tarball.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/tarball.html b/Allura/allura/templates/repo/tarball.html
index 21bc7d7..3f0581c 100644
--- a/Allura/allura/templates/repo/tarball.html
+++ b/Allura/allura/templates/repo/tarball.html
@@ -29,7 +29,7 @@ Commit <a href="{{commit.url()}}">{{commit.shorthand_id()}}</a> {{commit_labels(
{{ super() }}
<script type="text/javascript">$(function() {
{% set path = request.params.get('path', '') %}
- {% if status == 'ready' %}
+ {% if status == 'complete' %}
{% if 'no-redirect' not in request.params %}
$(document).ready(function() {
window.location.href = '{{c.app.repo.tarball_url(revision, path)}}';
@@ -56,6 +56,7 @@ Commit <a href="{{commit.url()}}">{{commit.shorthand_id()}}</a> {{commit_labels(
var delay = 500;
function check_status() {
$.get('{{commit.url()}}tarball_status?path={{path}}', function(data) {
+ console.log(data)
if (data.status === 'complete') {
spinner.stop();
$('#snapshot_status h2').hide();