From a96f75c39642dc860d42968f7ea7f8008ab9c43f Mon Sep 17 00:00:00 2001
From: Maykel Moya <mmoya@speedyrails.com>
Date: Thu, 17 Oct 2013 11:59:12 +0200
Subject: [PATCH] Do key validation only when key is provided

key_id is optional, the previous code didn't handle the case of key_id
not specified
---
 packaging/apt_key | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packaging/apt_key b/packaging/apt_key
index c9a85313b2d..48c3873eb31 100644
--- a/packaging/apt_key
+++ b/packaging/apt_key
@@ -188,11 +188,12 @@ def main():
     state           = module.params['state']
     changed         = False
 
-    try:
-        _ = int(key_id, 16)
-        key_id = key_id.lstrip('0x')
-    except ValueError:
-        module.fail_json("Invalid key_id")
+    if key_id:
+        try:
+            _ = int(key_id, 16)
+            key_id = key_id.lstrip('0x')
+        except ValueError:
+            module.fail_json("Invalid key_id")
 
     # FIXME: I think we have a common facility for this, if not, want
     check_missing_binaries(module)