[releng] block_retired: Untag EPEL builds first

[Till Maas]

commit 52784e026b07af0223bbed60d80054e4168c1dfd
Author: Till Maas <opensource at till.name>
Date:   Wed Nov 19 22:32:57 2014 +0100

    block_retired: Untag EPEL builds first

 scripts/block_retired.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/scripts/block_retired.py b/scripts/block_retired.py
index 746cff9..e6058f2 100755
--- a/scripts/block_retired.py
+++ b/scripts/block_retired.py
@@ -165,12 +165,16 @@ def block_package(packages, branch="master", staging=False):
 
     mapper = ReleaseMapper(staging=staging)
     tag = mapper.koji_tag(branch)
-    run_koji(["block-pkg", tag] + packages)
-
     epel_build_tag = mapper.epel_build_tag(branch)
 
+    # Untag builds first due to koji/mash bug:
+    # https://fedorahosted.org/koji/ticket/299
     if epel_build_tag:
         run_koji(["untag-build", "--all", tag] + packages)
+
+    run_koji(["block-pkg", tag] + packages)
+
+    if epel_build_tag:
         run_koji(["unblock-pkg", epel_build_tag] + packages)