Skip to content

Commit ebdabae

Browse files
authored
Merge pull request #1471 from nf-core/fix_sortmerna_index
Fix prepare_genome subworkflow for sortmerna
2 parents 06fa117 + f449840 commit ebdabae

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Special thanks to the following for their contributions to the release:
2222
- [PR #1470](https://github.com/nf-core/rnaseq/pull/1470) - Update subworkflow to account for fix to bad argument handling
2323
- [PR #1469](https://github.com/nf-core/rnaseq/pull/1469) - Minor docs fix
2424
- [PR #1459](https://github.com/nf-core/rnaseq/pull/1466) - Remove reference to unused "skip_sample_count" value in email templates
25+
- [PR #1471](https://github.com/nf-core/rnaseq/pull/1471) - Fix prepare_genome subworkflow for sortmerna
2526

2627
### Software dependencies
2728

subworkflows/local/prepare_genome/main.nf

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,16 +233,18 @@ workflow PREPARE_GENOME {
233233
if ('sortmerna' in prepare_tool_indices) {
234234
ribo_db = file(sortmerna_fasta_list)
235235

236+
// SortMeRNA needs the rRNAs even if we're providing the index
237+
ch_rrna_fastas = Channel.from(ribo_db.readLines())
238+
.map { row -> file(row, checkIfExists: true) }
239+
236240
if (sortmerna_index) {
237241
if (sortmerna_index.endsWith('.tar.gz')) {
238242
ch_sortmerna_index = UNTAR_SORTMERNA_INDEX ( [ [:], sortmerna_index ] ).untar.map { it[1] }
239243
ch_versions = ch_versions.mix(UNTAR_SORTMERNA_INDEX.out.versions)
240244
} else {
241-
ch_sortmerna_index = Channel.value(file(sortmerna_index))
245+
ch_sortmerna_index = Channel.value([[:], file(sortmerna_index)])
242246
}
243247
} else {
244-
ch_rrna_fastas = Channel.from(ribo_db.readLines())
245-
.map { row -> file(row, checkIfExists: true) }
246248

247249
SORTMERNA_INDEX (
248250
Channel.of([ [],[] ]),

0 commit comments

Comments
 (0)