diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiPathPatternFormatter.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiPathPatternFormatter.java index f80bbf2205..6e4f2d90ac 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiPathPatternFormatter.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiPathPatternFormatter.java @@ -45,12 +45,17 @@ public class KojiPathPatternFormatter private final Logger logger = LoggerFactory.getLogger( getClass() ); public Set getPatterns( ArtifactRef artifactRef, List archives ) + { + return getPatterns( artifactRef, archives, false ); + } + + public Set getPatterns( ArtifactRef artifactRef, List archives, boolean skipVersionTest ) { Set patterns = new HashSet<>(); for ( KojiArchiveInfo a : archives ) { ArtifactRef ar = a.asArtifact(); - if ( !kojiUtils.isVersionSignatureAllowedWithVersion( a.getVersion() ) ) + if ( !skipVersionTest && !kojiUtils.isVersionSignatureAllowedWithVersion( a.getVersion() ) ) { logger.warn( "Cannot use Koji archive for path_mask_patterns: {}. Version '{}' is not allowed from Koji.", a, diff --git a/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java b/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java index 58dc28ab8d..0fcfcdecf3 100644 --- a/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java +++ b/addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java @@ -228,7 +228,7 @@ public KojiRepairResult repairPathMask( KojiRepairRequest request, String user, } // set pathMaskPatterns using build output paths - Set patterns = kojiPathFormatter.getPatterns( artifactRef, archives ); + Set patterns = kojiPathFormatter.getPatterns( artifactRef, archives, true ); logger.debug( "For repo: {}, resetting path_mask_patterns to:\n\n{}\n\n", store.getKey(), patterns );