From: Zack Cerza <zack@redhat.com>
Date: Thu, 18 Dec 2014 21:02:12 +0000 (-0700)
Subject: Fix yum-repo-mangling regexp
X-Git-Tag: 1.1.0~1058
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19c9d6ad88d2cbedda44b07e40887da144d168ad;p=teuthology.git

Fix yum-repo-mangling regexp

It was failing to work if the branch name contained a '-'.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index df36c5a2f..f07dbc347 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -406,7 +406,7 @@ def _yum_fix_repo_priority(remote, project, uri):
             run.Raw(
                 '\':a;N;$!ba;s/enabled=1\\ngpg/enabled=1\\npriority=1\\ngpg/g\''),
             '-e',
-            run.Raw("'s;ref/[a-zA-Z0-9_]*/;{uri}/;g'".format(uri=uri)),
+            run.Raw("'s;ref/[a-zA-Z0-9_-]*/;{uri}/;g'".format(uri=uri)),
             '/etc/yum.repos.d/%s.repo' % project,
         ]
     )