From 5a86b82cec83728ba11731e8e4737cbbba769a35 Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Mon, 9 Sep 2013 17:26:44 -0500
Subject: [PATCH] Fixing typos in is_keyid function definition and usage
Fixes #4068
---
packaging/rpm_key | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packaging/rpm_key b/packaging/rpm_key
index 151f0bd9779..babdc5e0c20 100644
--- a/packaging/rpm_key
+++ b/packaging/rpm_key
@@ -86,7 +86,7 @@ class RpmKey:
keyfile = self.fetch_key(key)
keyid = self.getkeyid(keyfile)
should_cleanup_keyfile = True
- elif is_keyid(key):
+ elif self.is_keyid(key):
keyid = key
elif os.path.isfile(key):
keyfile = key
@@ -147,7 +147,7 @@ class RpmKey:
return keyid
self.json_fail(msg="Unexpected gpg output")
- def is_keyid(keystr):
+ def is_keyid(self, keystr):
"""Verifies if a key, as provided by the user is a keyid"""
return re.match('(0x)?(0-9a-f){8}', keystr, flags=re.IGNORECASE)