diff options
Diffstat (limited to 'gbp')
| -rw-r--r-- | gbp/rpm/__init__.py | 6 | ||||
| -rwxr-xr-x | gbp/scripts/import_srpm.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py index 1b80ba0a..332bc83d 100644 --- a/gbp/rpm/__init__.py +++ b/gbp/rpm/__init__.py @@ -966,7 +966,7 @@ def compose_version_str(evr): return None -def filter_version(evr, key): +def filter_version(evr, *keys): """ Remove entry from the version dict @@ -979,8 +979,10 @@ def filter_version(evr, key): >>> filter_version({'epoch': 'foo', 'upstreamversion': 'bar', 'vendor': 'baz'}, 'vendor').keys() ['epoch', 'upstreamversion'] + >>> filter_version({'epoch': 'foo', 'upstreamversion': 'bar', 'revision': 'baz'}, 'epoch', 'revision').keys() + ['upstreamversion'] """ - return {k: evr[k] for k in evr if k != key} + return {k: evr[k] for k in evr if k not in keys} # vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py index 231877b5..f98a6598 100755 --- a/gbp/scripts/import_srpm.py +++ b/gbp/scripts/import_srpm.py @@ -326,7 +326,7 @@ def main(argv): else: src_tag_format = options.upstream_tag src_tag = repo.version_to_tag(src_tag_format, tag_str_fields) - upstream_str_fields = filter_version(tag_str_fields, 'release') + upstream_str_fields = filter_version(tag_str_fields, 'release', 'epoch') upstream_tag = repo.version_to_tag(src_tag_format, upstream_str_fields) ver_str = compose_version_str(spec.version) |