# HG changeset patch
# User pjbriggs
# Date 1429619356 14400
# Node ID 0c6b14f3fefcbf068f71c927a83cb7f6e48b6295
# Parent 344dd37d1704ce3c0d4ad0a57dc791aaf13569f1
Attempt to fix installation of tool dependencies for UCSC/bigwig generation, and trap for undefined genome build.
diff -r 344dd37d1704 -r 0c6b14f3fefc macs21_wrapper.py
--- a/macs21_wrapper.py Tue Apr 21 07:53:37 2015 -0400
+++ b/macs21_wrapper.py Tue Apr 21 08:29:16 2015 -0400
@@ -77,6 +77,10 @@
# Determine genome build
chrom_sizes = os.path.basename(chrom_sizes)
genome_build = chrom_sizes.split('.')[0]
+ if genome_build == '?':
+ # No genome build set
+ sys.stderr.write("ERROR genome build not set, cannot get sizes for '?'\n")
+ sys.exit(1)
print "Missing chrom sizes file, attempting to fetch for '%s'" % genome_build
# Run fetchChromSizes
chrom_sizes = os.path.join(working_dir,chrom_sizes)
diff -r 344dd37d1704 -r 0c6b14f3fefc tool_dependencies.xml
--- a/tool_dependencies.xml Tue Apr 21 07:53:37 2015 -0400
+++ b/tool_dependencies.xml Tue Apr 21 08:29:16 2015 -0400
@@ -32,6 +32,9 @@
$INSTALL_DIR/bedGraphToBigWig
+
+ $INSTALL_DIR
+