diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2015-02-04 17:36:47 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2015-04-02 08:51:25 +0200 |
| commit | 828cb24fb1782f44e638baab1d325661dbb59dc7 (patch) | |
| tree | 1a8ae48ea2f4fd570ef1dcf6be5b9d01182a91d1 | |
| parent | 37972d01fdfc27158de65b220912f2356fce2e65 (diff) | |
gbp.rpm: use format_str for composing tag name
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
| -rw-r--r-- | gbp/rpm/git.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gbp/rpm/git.py b/gbp/rpm/git.py index c7cc023b..bc9e020c 100644 --- a/gbp/rpm/git.py +++ b/gbp/rpm/git.py @@ -17,6 +17,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import re +from gbp.format import format_str +from gbp.errors import GbpError from gbp.git import GitRepository, GitRepositoryError from gbp.pkg.pristinetar import PristineTar from gbp.rpm import compose_version_str @@ -42,7 +44,7 @@ class RpmGitRepository(GitRepository): """ try: tag = self.version_to_tag(format, str_fields) - except KeyError: + except GbpError: return None if self.has_tag(tag): # new tags are injective # dereference to a commit object @@ -65,8 +67,9 @@ class RpmGitRepository(GitRepository): >>> RpmGitRepository.version_to_tag("%(vendor)s/v%(version)s", dict(upstreamversion='1.0', release='2', vendor="myvendor")) 'myvendor/v1.0-2' """ - version_tag = format % dict(str_fields, - version=compose_version_str(str_fields)) + version_tag = format_str(format, + dict(str_fields, + version=compose_version_str(str_fields))) return RpmGitRepository._sanitize_tag(version_tag) @staticmethod |