Added function to check missing GPG keys, fixed #470

ee/cli/plugins/stack.py

@@ -16,6 +16,7 @@ from ee.core.checkfqdn import check_fqdn
 from pynginxconfig import NginxConfig
 from ee.core.services import EEService
 from ee.core.variables import EEVariables
+from ee.core.gpgkeyfix import gpgkeyfix
 import random
 import string
 import configparser
@@ -1583,7 +1584,16 @@ class EEStackController(CementBaseController):
             if len(apt_packages):
                 EESwap.add(self)
                 Log.info(self, "Updating apt-cache, please wait...")
-                EEAptGet.update(self)
+
+                if not EEAptGet.update(self):
+                    Log.info(self, "Fixing mixing GPG keys, please wait...")
+                    gpgkeyfix(self)
+                    if not EEAptGet.update(self):
+                        Log.info(self, Log.FAIL + "Oops Something went "
+                                 "wrong!!")
+                        Log.error(self, "Check logs for reason "
+                                  "`tail /var/log/ee/ee.log` & Try Again!!!")
+
                 Log.info(self, "Installing packages, please wait...")
                 EEAptGet.install(self, apt_packages)
             if len(packages):

ee/cli/plugins/stack_migrate.py

@@ -7,6 +7,7 @@ from ee.core.aptget import EEAptGet
 from ee.core.shellexec import EEShellExec
 from ee.core.apt_repo import EERepo
 from ee.core.services import EEService
+from ee.core.gpgkeyfix import gpgkeyfix
 import configparser
 import os
 
@@ -88,7 +89,15 @@ class EEStackMigrateController(CementBaseController):
                                            "libclass-dbi-mysql-perl"]
 
         Log.info(self, "Updating apt-cache, please wait...")
-        EEAptGet.update(self)
+
+        if not EEAptGet.update(self):
+            Log.info(self, "Fixing mixing GPG keys, please wait...")
+            gpgkeyfix(self)
+            if not EEAptGet.update(self):
+                Log.info(self, Log.FAIL + "Oops Something went wrong!!")
+                Log.error(self, "Check logs for reason "
+                          "`tail /var/log/ee/ee.log` & Try Again!!!")
+
         Log.info(self, "Installing MariaDB, please wait...")
         EEAptGet.remove(self, ["mysql-common", "libmysqlclient18"])
         EEAptGet.auto_remove(self)

ee/cli/plugins/stack_upgrade.py

@@ -7,6 +7,7 @@ from ee.core.apt_repo import EERepo
 from ee.core.services import EEService
 from ee.core.fileutils import EEFileUtils
 from ee.core.shellexec import EEShellExec
+from ee.core.gpgkeyfix import gpgkeyfix
 import configparser
 import os
 
@@ -76,7 +77,14 @@ class EEStackUpgradeController(CementBaseController):
                                       "php55", "php56")
 
         Log.info(self, "Updating apt-cache, please wait...")
-        EEAptGet.update(self)
+        if not EEAptGet.update(self):
+            Log.info(self, "Fixing mixing GPG keys, please wait...")
+            gpgkeyfix(self)
+            if not EEAptGet.update(self):
+                Log.info(self, Log.FAIL + "Oops Something went wrong!!")
+                Log.error(self, "Check logs for reason "
+                          "`tail /var/log/ee/ee.log` & Try Again!!!")
+
         Log.info(self, "Installing packages, please wait ...")
         EEAptGet.install(self, EEVariables.ee_php)
 

ee/core/aptget.py

@@ -13,7 +13,7 @@ class EEAptGet():
 
     def update(self):
         """
-        Similar to `apt-get upgrade`
+        Similar to `apt-get update`
         """
         try:
             with open('/var/log/ee/ee.log', 'a') as f:
@@ -26,7 +26,7 @@ class EEAptGet():
             if proc.returncode == 0:
                 return True
             else:
-                Log.error(self, "Unable to run apt-get update")
+                return False
 
         except Exception as e:
             Log.error(self, "Error while installing packages, "

ee/core/gpgkeyfix.py

@@ -0,0 +1,20 @@
+"""EasyEngine apt-get update GPG Key fix module"""
+
+import os
+import subprocess
+
+
+def gpgkeyfix(self):
+    try:
+        sub = subprocess.Popen('apt-get update', stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE, shell=True)
+        sub.wait()
+        output, error_output = sub.communicate()
+        if "NO_PUBKEY" in str(error_output):
+            error_list = str(error_output).split("\\n")
+            for single_error in error_list:
+                if "NO_PUBKEY" in single_error:
+                    key = single_error.rsplit(None, 1)[-1]
+                    EERepo.add_key(self, key)
+    except Exception as e:
+        Log.error(self, "Error while fixing GPG keys")