centos/centpkg
1
0
Fork 0
mirror of https://git.centos.org/centos/centpkg.git synced 2025-02-24 00:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move the _is_sigbranch check into the distgit directory class, and set the target appropriately

Browse source
This commit is contained in:
Brian Stinson 2015-07-24 19:46:39 -05:00
parent a1a2e22b97
commit 3ab1c85425
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/centpkg/__init__.py
View file

@ -101,12 +101,6 @@ class Commands(Commands):
self.distgitdir = DistGitDirectory(self.branch_merge) 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 # redefined loaders
def load_rpmdefines(self): def load_rpmdefines(self):
''' '''
@ -149,12 +143,12 @@ class Commands(Commands):
# Distribution branches start with c and may or may not end in -plus # Distribution branches start with c and may or may not end in -plus
# otherwise, it's a sig branch # 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 # send distribution packages to build on the the bananas tags for now
self._target = 'bananas{0}-{1}'.format(self.distval, self.disttag) self._target = 'bananas{0}-{1}'.format(self.distval, self.disttag)
else: else:
# sig packages are built in the tag that matches the git branch # 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): def load_user(self):
try: try: