# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Ross Lazarus <ross.lazarus@gmail.com> # Date 1289235967 18000 # Node ID 629e14c5f561446c963b05560f245e2ed7041ff0 # Parent 7ca26b1cc9b6fd67364a6c6af6005ceecaa3f45b Fix for failing rg Haploview test - finally tracked down trivial pdfjoin error - new pdfjam version does not want quoted filespec --- a/lib/galaxy/datatypes/genetics.py +++ b/lib/galaxy/datatypes/genetics.py @@ -100,7 +100,6 @@ class GenomeGraphs( Tabular ): s = ''.join(sl) s = urllib.quote_plus(s) redirect_url = s - log.debug('## rg gg ucsc rdurl=%s; s = %s' % (redirect_url,s)) link = '%s?redirect_url=%s&display_url=%s' % ( internal_url, redirect_url, display_url ) ret_val.append( (site_name, link) ) return ret_val --- a/tools/rgenetics/rgHaploView.py +++ b/tools/rgenetics/rgHaploView.py @@ -394,7 +394,7 @@ def ld(): p=subprocess.Popen(vcl,shell=True,cwd=outfpath,stderr=lf,stdout=lf) retval = p.wait() lf.write('## executing %s returned %d\n' % (vcl,retval)) - vcl = '%s "*.pdf" --fitpaper true --outfile alljoin.pdf' % pdfjoin + vcl = '%s *.pdf --fitpaper true --outfile alljoin.pdf' % pdfjoin p=subprocess.Popen(vcl,shell=True,cwd=outfpath,stderr=lf,stdout=lf) retval = p.wait() lf.write('## executing %s returned %d\n' % (vcl,retval))