projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
[htsworkflow.git]
/
encode_submission
/
trackhub.py
diff --git
a/encode_submission/trackhub.py
b/encode_submission/trackhub.py
index c5c254358f972289bba132deae366c9dbcc897f9..fb0cea8771dcbc25b11dc95654e1e12ed62d2eb9 100644
(file)
--- a/
encode_submission/trackhub.py
+++ b/
encode_submission/trackhub.py
@@
-27,7
+27,6
@@
import RDF
if not 'DJANGO_SETTINGS_MODULE' in os.environ:
os.environ['DJANGO_SETTINGS_MODULE'] = 'htsworkflow.settings'
if not 'DJANGO_SETTINGS_MODULE' in os.environ:
os.environ['DJANGO_SETTINGS_MODULE'] = 'htsworkflow.settings'
-
from htsworkflow.util import api
from htsworkflow.util.rdfhelp import \
dafTermOntology, \
from htsworkflow.util import api
from htsworkflow.util.rdfhelp import \
dafTermOntology, \
@@
-78,10
+77,10
@@
def main(cmdline=None):
logger.warn("File %s doesn't exist.", a)
if opts.make_link_tree_from is not None:
logger.warn("File %s doesn't exist.", a)
if opts.make_link_tree_from is not None:
- results.make_tree_from(opts.make_tree_from, link=True)
+ results.make_tree_from(opts.make_
link_
tree_from, link=True)
if opts.copy_tree_from is not None:
if opts.copy_tree_from is not None:
- results.make_tree_from(opts.
make
_tree_from, link=False)
+ results.make_tree_from(opts.
copy
_tree_from, link=False)
if opts.fastq:
logger.info("Building fastq extraction scripts")
if opts.fastq:
logger.info("Building fastq extraction scripts")