self parameter missing in add_repo

Author: harshadyeola

ee/core/apt_repo.py

@@ -48,11 +48,12 @@ def remove(self, repo_url=None):
                              "--remove '{ppa_name}'"
                              .format(ppa_name=repo_url))
 
-    def add_key(keyids, keyserver=None):
+    def add_key(self, keyids, keyserver=None):
         if keyserver is None:
-            EEShellExec.cmd_exec("gpg --keyserver {serv}"
-                                 .format(serv=(keyserver
-                                         or "hkp://keys.gnupg.net"))
+            EEShellExec.cmd_exec(self, "gpg --keyserver {serv}"
+                                 .format(serv=(keyserver or
+                                               "hkp://keys.gnupg.net"))
                                  + " --recv-keys {key}".format(key=keyids))
-            EEShellExec.cmd_exec("gpg -a --export --armor {0}".format(keyids)
+            EEShellExec.cmd_exec(self, "gpg -a --export --armor {0}"
+                                 .format(keyids)
                                  + " | apt-key add - ")

ee/core/aptget.py

@@ -50,15 +50,25 @@ def install_package(self, package_name):
                     #apt_cache.close()
                     return False
                 else:
-                    pkg.mark_install()
+                    try:
+                        print(pkg.name)
+                        pkg.mark_install()
+                    except Exception as e:
+                        Log.debug(self, str(e))
+                        Log.error(self, str(e))
+
                     try:
                         #apt_pkg.PkgSystemUnLock()
                         result = apt_cache.commit()
                         #apt_cache.close()
                         return result
                     except SystemError as e:
+                        Log.debug(self, 'SystemError: ' + str(e))
                         Log.error(self, 'SystemError: ' + str(e))
                         #apt_cache.close()
+                    except Exception as e:
+                        Log.debug(self, str(e))
+                        Log.error(self, str(e))
             else:
                 #apt_cache.close()
                 Log.error(self, 'Unknown package selected (' +
@@ -85,6 +95,7 @@ def remove_package(self, package_name, purge=False):
                     return False
                 else:
                     try:
+                        print(pkg.name)
                         pkg.mark_delete(purge)
                     except SystemError as e:
                         Log.debug(self, 'SystemError: ' + str(e))
@@ -97,6 +108,9 @@ def remove_package(self, package_name, purge=False):
                     except SystemError as e:
                         Log.debug(self, 'SystemError: ' + str(e))
                         return False
+                    except Exception as e:
+                        Log.debug(self, str(e))
+                        Log.error(self, str(e))
                         # apt_cache.close()
             else:
                 # apt_cache.close()