apt-get upgrade

ee/core/aptget.py

@@ -16,8 +16,8 @@ class EEAptGet:
         self.cache.update(self.fprogress)
         pass
 
-    def install(self, packages):
-        """Installation of packages"""
+    def upgrade(self, packages):
+        """Similar to apt-get update"""
         my_selected_packages = []
         # Cache Initialization
         self.cache = apt.Cache()
@@ -29,13 +29,59 @@ class EEAptGet:
             if pkg.is_installed:
                 # Check Package is Upgradeble
                 if pkg.is_upgradable:
-                    print("latest version of \'{package_name}\' available."
-                          .format(package_name=pkg.installed))
+                    with self.cache.actiongroup():
+                        # Mark Package for Upgrade
+                        pkg.mark_upgrade()
+                    my_selected_packages.append(pkg.installed)
                 else:
                     print("\'{package_name}-{package_ver.version}\'"
                           "already the newest version"
                           .format(package_name=pkg.name,
                                   package_ver=pkg.installed))
+
+        # Check if packages available for install.
+        if len(my_selected_packages) > 0:
+            print("The following packages will be upgraded:"
+                  "\n {pkg_name}"
+                  .format(pkg_name=my_selected_packages))
+            print("{pkg_install_count} newly installed."
+                  .format(pkg_upgrade_count=len(my_selected_packages)))
+            print("Need to get {req_download} bytes of archives"
+                  .format(req_download=self.cache.required_download))
+            print("After this operation, {space} bytes of"
+                  "additional disk space will be used."
+                  .format(space=self.cache.required_space))
+            try:
+                # Commit changes in cache (actually install)
+                self.cache.commit(self.fprogress, self.iprogress)
+            except Exception as e:
+                print("package installation failed. [{err}]"
+                      .format(err=str(e)))
+                return(False)
+        return(True)
+
+    def install(self, packages):
+        """Installation of packages"""
+        my_selected_packages = []
+        # Cache Initialization
+        self.cache = apt.Cache()
+        # Cache Read
+        self.cache.open()
+        for package in packages:
+            pkg = self.cache[package]
+            # Check Package Installed
+            if pkg.is_installed or pkg.marked_install:
+                # Check Package is Upgradeble
+                if pkg.is_upgradable:
+                    print("latest version of \'{package_name}\' available."
+                          .format(package_name=pkg.installed))
+                else:
+                    # Check if package already marked for install
+                    if not pkg.marked_install:
+                        print("\'{package_name}-{package_ver}\'"
+                              "already the newest version"
+                              .format(package_name=pkg.name,
+                                      package_ver=pkg.installed))
             else:
                 with self.cache.actiongroup():
                     # Mark Package for Installation
@@ -58,8 +104,10 @@ class EEAptGet:
                 # Commit changes in cache (actually install)
                 self.cache.commit(self.fprogress, self.iprogress)
             except Exception as e:
-                print("package installation failed[{err}]"
+                print("package installation failed. [{err}]"
                       .format(err=str(e)))
+                return(False)
+        return(True)
 
     def remove(self, packages, purge_value=False):
         """Removal of packages Similar to apt-get remove"""
@@ -72,20 +120,22 @@ class EEAptGet:
         for package in packages:
             pkg = self.cache[package]
             # Check if packages installed
-            if pkg.is_installed:
+            if pkg.is_installed and not pkg.marked_delete:
                 with self.cache.actiongroup():
                     # Mark packages for delete
                     # Mark to purge package if purge_value is True
                     pkg.mark_delete(purge=purge_value)
                 my_selected_packages.append(pkg.name)
             else:
-                print("Package '{package_name}' is not installed,"
-                      " so not removed."
-                      .format(package_name=packages))
+                # Check If package not already marked for delete
+                if not pkg.marked_delete:
+                    print("Package '{package_name}' is not installed,"
+                          " so not removed."
+                          .format(package_name=package))
 
         # Check if packages available for remove/update.
         if self.cache.delete_count > 0:
-            print("The following NEW packages will be REMOVED:"
+            print("The following packages will be REMOVED:"
                   "\n {pkg_name}"
                   .format(pkg_name=my_selected_packages))
             print("{pkg_remove_count} to remove."
@@ -93,11 +143,13 @@ class EEAptGet:
             print("After this operation, {space} bytes disk spac"
                   "e will be freed.".format(space=self.cache.required_space))
             try:
-                self.cache.commit()
+                self.cache.commit(self.fprogress, self.iprogress)
             except Exception as e:
                 print("Sorry, package installation failed [{err}]"
                       .format(err=str(e)))
+                return(False)
+        return(True)
 
     def purge(self, packages):
         """Purging of packages similar to apt-get purge"""
-        self.remove(packages, purge_value=True)
+        return(self.remove(packages, purge_value=True))