From 5d6595193875a2f8ac4e8580bc9752639e7a6adc Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Wed, 7 Sep 2016 16:41:13 +0300
Subject: [PATCH] Make removing artifacts work with rri branches

---
 TeamCityBuild.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 227a84207be..afa0c0ee09d 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -157,14 +157,16 @@
 
     <condition property="need.remove.artifacts" value="true">
         <and>
-            <matches pattern="rr/.*" string="${teamcity.build.branch}"/>
+            <matches pattern="rri?/.*" string="${teamcity.build.branch}"/>
             <not>
-                <matches pattern="rr/internal/.*" string="${teamcity.build.branch}"/>
+                <matches pattern="rri?/internal/.*" string="${teamcity.build.branch}"/>
             </not>
         </and>
     </condition>
 
-    <target name="remove_internal_artifacts" description="Remove internal artifacts for rr/* branches, but store them for rr/internal/*" if="need.remove.artifacts">
+    <target name="remove_internal_artifacts"
+            description="Remove internal artifacts for rri?/* branches, but store them for rri?/internal/*"
+            if="need.remove.artifacts">
         <echo message="Remove internal artifacts" />
 
         <delete failonerror="false" verbose="true">