import_srpm: Drop epoch too

Upstream tags are without epoch so we need to filter that out too.

Thanks: Tzafrir Cohen

1 files changed, 4 insertions, 2 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\:·: