From 9405b6b7e530d090fea82be54e1f6922bef63975 Mon Sep 17 00:00:00 2001
From: Rui Han <ruhan@redhat.com>
Date: Thu, 11 Apr 2019 15:07:35 +0800
Subject: [PATCH] Add skipVersionTest flag when doing Koji path mask repair

---
 .../indy/koji/content/KojiPathPatternFormatter.java        | 7 ++++++-
 .../org/commonjava/indy/koji/data/KojiRepairManager.java   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

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<String> getPatterns( ArtifactRef artifactRef, List<KojiArchiveInfo> archives )
+    {
+        return getPatterns( artifactRef, archives, false );
+    }
+
+    public Set<String> getPatterns( ArtifactRef artifactRef, List<KojiArchiveInfo> archives, boolean skipVersionTest )
     {
         Set<String> 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<String> patterns = kojiPathFormatter.getPatterns( artifactRef, archives );
+                        Set<String> patterns = kojiPathFormatter.getPatterns( artifactRef, archives, true );
                         logger.debug( "For repo: {}, resetting path_mask_patterns to:\n\n{}\n\n", store.getKey(),
                                      patterns );