From f893a13fdec811b25f0fa33a6072456850ded117 Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: May 17 2016 18:58:06 +0000 Subject: guess dist values from branch name fedpkg knows few branches epel*, fedora* etc. However in dist-git there can be more branches. For example in Copr we plan to have custom branches, Mageia etc. Since fedpkg is in Copr used only for generating srpm, it is better to create *some* disttag rather then raising error. Other values are not used at all. This RE will work for most values of dist-git branches. And it is better than hardcoding new value every time we add new chroot and dist-git branch. --- diff --git a/src/fedpkg/__init__.py b/src/fedpkg/__init__.py index 5f12021..051fc8d 100644 --- a/src/fedpkg/__init__.py +++ b/src/fedpkg/__init__.py @@ -166,6 +166,14 @@ class Commands(pyrpkg.Commands): self.mockconfig = 'fedora-rawhide-%s' % self.localarch self.override = None self._distunset = 'rhel' + elif re.match(r'\D+\d+$', self.branch_merge): + m = re.match(r'(\D+)(\d+)$', self.branch_merge) + self._distval = m.group(2) + self._distvar = m.group(1) + self.dist = '%s%s' % (self._distvar[:2], self._distval) + self.mockconfig = '%s-%s-%s' % (self._distvar, self._distval, self.localarch) + self.override = '%s-override' % self.branch_merge + self._distunset = 'rhel' # If we don't match one of the above, punt else: raise pyrpkg.rpkgError('Could not find the dist from branch name '