keyserver issue fix

Author: gau1991

ee/cli/plugins/stack.py

@@ -90,7 +90,7 @@ def pre_pref(self, apt_packages):
             Log.debug(self, 'Adding key for {0}'
                       .format(EEVariables.ee_mysql_repo))
             EERepo.add_key(self, '1C4CBDCDCD2EFD2A',
-                           keyserver="subkeys.pgp.net")
+                           keyserver="http://keyserver.ubuntu.com:80")
             chars = ''.join(random.sample(string.ascii_letters, 8))
             Log.debug(self, "Pre-seeding MySQL")
             EEShellExec.cmd_exec(self, "echo \"percona-server-server-5.6 "

ee/core/apt_repo.py

@@ -71,11 +71,10 @@ def add_key(self, keyids, keyserver=None):
         default keyserver is hkp://keys.gnupg.net
         user can provide other keyserver with keyserver="hkp://xyz"
         """
-        if keyserver is None:
-            EEShellExec.cmd_exec(self, "gpg --keyserver {serv}"
-                                 .format(serv=(keyserver or
-                                               "hkp://keys.gnupg.net"))
-                                 + " --recv-keys {key}".format(key=keyids))
-            EEShellExec.cmd_exec(self, "gpg -a --export --armor {0}"
-                                 .format(keyids)
-                                 + " | apt-key add - ")
+        EEShellExec.cmd_exec(self, "gpg --keyserver {serv}"
+                             .format(serv=(keyserver or
+                                           "hkp://keys.gnupg.net"))
+                             + " --recv-keys {key}".format(key=keyids))
+        EEShellExec.cmd_exec(self, "gpg -a --export --armor {0}"
+                             .format(keyids)
+                             + " | apt-key add - ")