From df795ff3155b671d826c9ca5bd504656b68e437b Mon Sep 17 00:00:00 2001 From: jorgee Date: Mon, 9 Dec 2024 16:59:22 +0100 Subject: [PATCH] saving original path to generate repository URL Signed-off-by: jorgee --- .../groovy/nextflow/scm/AzureRepositoryProvider.groovy | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/nextflow/src/main/groovy/nextflow/scm/AzureRepositoryProvider.groovy b/modules/nextflow/src/main/groovy/nextflow/scm/AzureRepositoryProvider.groovy index 436a300a9c..8435099ebf 100644 --- a/modules/nextflow/src/main/groovy/nextflow/scm/AzureRepositoryProvider.groovy +++ b/modules/nextflow/src/main/groovy/nextflow/scm/AzureRepositoryProvider.groovy @@ -35,7 +35,7 @@ final class AzureRepositoryProvider extends RepositoryProvider { private String user private String repo - private boolean includesRepo; //Flag to indicate if project already include the repo + private String urlPath; private String continuationToken AzureRepositoryProvider(String project, ProviderConfig config=null) { @@ -43,14 +43,13 @@ final class AzureRepositoryProvider extends RepositoryProvider { Azure repo format follows Organization/Project/Repository where Project can be optional If Project is not present then Repository is used as Project (and also as Repository) */ + this.urlPath = project def tokens = project.tokenize('/') this.repo = tokens.removeLast() if( tokens.size() == 1){ this.project = [tokens.first(), this.repo].join('/') - this.includesRepo = true }else{ this.project = tokens.join('/') - this.includesRepo = false } this.config = config ?: new ProviderConfig('azurerepos') this.continuationToken = null @@ -167,7 +166,7 @@ final class AzureRepositoryProvider extends RepositoryProvider { /** {@inheritDoc} */ @Override String getRepositoryUrl() { - includesRepo ? "${config.server}/$project" : "${config.server}/$project/$repo" + "${config.server}/${urlPath}" } /** {@inheritDoc} */