From 3ab1c8542528dd8060ee664829b57a7f86b8b3ea Mon Sep 17 00:00:00 2001
From: Brian Stinson <brian@bstinson.com>
Date: Jul 25 2015 00:46:39 +0000
Subject: move the _is_sigbranch check into the distgit directory class, and set the target appropriately


---

diff --git a/src/centpkg/__init__.py b/src/centpkg/__init__.py
index e8a99bd..30d90bb 100644
--- a/src/centpkg/__init__.py
+++ b/src/centpkg/__init__.py
@@ -101,12 +101,6 @@ class Commands(Commands):
 
         self.distgitdir = DistGitDirectory(self.branch_merge)
 
-    def _is_sigbranch(self):
-        # if the current branch is not in the form c<version>, c<version>-plus,
-        # or c<version>-extras it's a sig branch
-
-        return not re.match('^c\d(-plus|-extras)*$', self.branch_merge)
-
     # redefined loaders
     def load_rpmdefines(self):
         '''
@@ -149,12 +143,12 @@ class Commands(Commands):
 
         # Distribution branches start with c and may or may not end in -plus
         # otherwise, it's a sig branch 
-        if not self._is_sigbranch():
+        if not self.distgitdir.distrobranch:
             # send distribution packages to build on the the bananas tags for now
             self._target = 'bananas{0}-{1}'.format(self.distval, self.disttag)
         else:
             # sig packages are built in the tag that matches the git branch
-            self._target = '{0}-el{1}'.format(self.branch_merge, self.distval)
+            self._target = self.distgitdir.target
 
     def load_user(self):
         try: