From b0b869761732becfdb6294b34ef6ba6b1f3b7b3c Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 12 Sep 2017 08:19:23 -0600
Subject: [PATCH] Always strip {name} from name

We have this protecte in the Job constructor but it needs to come
out no matter what.

Change-Id: I179f41df9ad01f8ebbdcb126f50ad347abcae11b
---
 zuul/cmd/migrate.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zuul/cmd/migrate.py b/zuul/cmd/migrate.py
index e9d6a1097e..2ba530cef4 100644
--- a/zuul/cmd/migrate.py
+++ b/zuul/cmd/migrate.py
@@ -283,7 +283,8 @@ class Job:
         if self.content and not self.name:
             self.name = get_single_key(content)
         if not self.name:
-            self.name = self.orig.replace('-{name}', '').replace('{name}-', '')
+            self.name = self.orig
+        self.name = self.name.replace('-{name}', '').replace('{name}-', '')
         if self.orig.endswith('-nv'):
             self.voting = False
         if self.name.endswith('-nv'):