| |
@@ -169,7 +169,7 @@
|
| |
"--define 'rhel %s'" % macros['rhel'],
|
| |
]
|
| |
# rawhide (previously master branch)
|
| |
- elif re.match(r'(master|rawhide|main)$', self.branch_merge):
|
| |
+ elif re.match(r'(rawhide|main)$', self.branch_merge):
|
| |
self._distval = self._findrawhidebranch()
|
| |
self._distvar = 'fedora'
|
| |
self._disttag = 'fc%s' % self._distval
|
| |
@@ -204,13 +204,13 @@
|
| |
self._rpmdefines.extend(extra_rpmdefines)
|
| |
|
| |
def build_target(self, release):
|
| |
- if release in ('rawhide', 'main', 'master'):
|
| |
+ if release in ('rawhide', 'main'):
|
| |
return 'rawhide'
|
| |
else:
|
| |
return '%s-candidate' % release
|
| |
|
| |
def load_container_build_target(self):
|
| |
- if self.branch_merge in ('rawhide', 'main', 'master'):
|
| |
+ if self.branch_merge in ('rawhide', 'main'):
|
| |
self._container_build_target = 'rawhide-%s-candidate' % self.ns
|
| |
else:
|
| |
super(Commands, self).load_container_build_target()
|
| |
hmm, this was probably an invalid comment.