Merge pull request #8104 from AdmiralNemo/patch-1

Correct regex in is_keyid
2014-07-11 14:30:35 -05:00 · 2014-07-11 14:30:35 -05:00 · fe3f6b3253
parent aa08368b8f dc304e6488
commit fe3f6b3253
1 changed files with 1 additions and 1 deletions
--- a/library/packaging/rpm_key
+++ b/library/packaging/rpm_key
@ -156,7 +156,7 @@ class RpmKey:

    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)
+        return re.match('(0x)?[0-9a-f]{8}', keystr, flags=re.IGNORECASE)

    def execute_command(self, cmd):
        if self.syslogging: