Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
b8750e88
Commit
b8750e88
authored
Apr 29, 2015
by
Mathieu Giraud
Browse files
models/task.py: fix previous commit
Thanks to the server unit tests !
parent
70f3cb19
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/web2py/applications/vidjil/models/task.py
View file @
b8750e88
# coding: utf8
import
os
import
sys
import
defs
import
re
import
os.path
import
time
import
sys
import
datetime
import
random
import
xmlrpclib
TASK_TIMEOUT
=
60
*
60
...
...
@@ -315,6 +316,7 @@ def run_fuse(id_file, id_config, id_data, id_fuse, clean_before=True, clean_afte
return
"SUCCESS"
def
custom_fuse
(
file_list
):
from
subprocess
import
Popen
,
PIPE
,
STDOUT
,
os
if
defs
.
PORT_FUSE_SERVER
is
None
:
raise
IOError
(
'This server cannot fuse custom data'
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment