3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/eafac82b3767/ changeset: eafac82b3767 user: jjohnson date: 2011-10-24 22:02:07 summary: FASTQ de-interlacer - fix for memory leak affected #: 1 file diff -r 0509a6aa2a7876648811b5b445ab7fcbbe982d32 -r eafac82b3767e3687916f35194f0e36b2c51f821 tools/fastq/fastq_paired_end_deinterlacer.py --- a/tools/fastq/fastq_paired_end_deinterlacer.py +++ b/tools/fastq/fastq_paired_end_deinterlacer.py @@ -21,12 +21,14 @@ i = None skip_count = 0 found = {} - for i, mate1 in enumerate( fastqReader( open( input_filename, 'rb' ), format = type ) ): + for i, read in enumerate( fastqReader( open( input_filename, 'rb' ), format = type ) ): - if mate1.identifier in found: - del found[mate1.identifier] + if read.identifier in found: + del found[read.identifier] continue + mate1 = input.get( read.identifier ) + mate2 = input.get( joiner.get_paired_identifier( mate1 ) ) if mate2: https://bitbucket.org/galaxy/galaxy-central/changeset/70d41c4b591e/ changeset: 70d41c4b591e branch: fastq-deinterlacer-memfix user: jmchilton date: 2011-10-24 22:27:17 summary: Creating branch for JJ's fastq-deinterlacer memory hole fix. affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/changeset/8d405036b501/ changeset: 8d405036b501 branch: fastq-deinterlacer-memfix user: jmchilton date: 2011-10-24 22:36:24 summary: Merging JJ fix with new branch for pull request. affected #: 1 file diff -r 70d41c4b591e808a738a61ba49f06d188df3d1f1 -r 8d405036b50167803b53cd8e69db5ea518d7b5b8 tools/fastq/fastq_paired_end_deinterlacer.py --- a/tools/fastq/fastq_paired_end_deinterlacer.py +++ b/tools/fastq/fastq_paired_end_deinterlacer.py @@ -21,12 +21,14 @@ i = None skip_count = 0 found = {} - for i, mate1 in enumerate( fastqReader( open( input_filename, 'rb' ), format = type ) ): + for i, read in enumerate( fastqReader( open( input_filename, 'rb' ), format = type ) ): - if mate1.identifier in found: - del found[mate1.identifier] + if read.identifier in found: + del found[read.identifier] continue + mate1 = input.get( read.identifier ) + mate2 = input.get( joiner.get_paired_identifier( mate1 ) ) if mate2: Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.