Merge lp:~mac9416/keryx/1.0 into lp:~keryx-admins/keryx/1.0

[mac9416]

[mac9416 (mac9416)]

I'm almost certain I improved something.

[Chris Oliver (excid3)]

Looks good. Go ahead and merge :)

review: Approve

[mac9416 (mac9416)]

Roger roger.

On Thu, Jan 21, 2010 at 8:11 PM, Chris Oliver <email address hidden> wrote:
> Review: Approve
> Looks good. Go ahead and merge :)
> --
> https://code.launchpad.net/~mac9416/keryx/1.0/+merge/17860
> You are the owner of lp:~mac9416/keryx/1.0.
>

=== modified file 'src/libkeryx/definitions/apt_def/__init__.py'
--- src/libkeryx/definitions/apt_def/__init__.py	2010-01-17 00:03:51 +0000
+++ src/libkeryx/definitions/apt_def/__init__.py	2010-01-22 00:52:13 +0000
@@ -224,7 +224,9 @@
         for p in packages:
             errcode, failure = commands.getstatusoutput("sudo apt-get -y -o dir::cache::archives=\"%s\" install %s" % (downloads_folder, p))
             if errcode:
-                logging.error(failure)
+                #FIXME: this line is causing unicode errors
+                #logging.error(failure)
+                print failure
                 return
         
         print "Finished installing.\n" \
@@ -349,6 +351,7 @@
 
         if found:
             #TODO: Remove the source from the database
+            pass
         else:
             logging.error("Source line not found in database: %s" % line)
             return False
@@ -407,7 +410,6 @@
 
     def __calculate_downloads(self, downloads, package, ver=None):
         """Calculates a list of packages to download"""
-
         # If we aren't looking for a specific version, get the latest        
         if not ver:
             url, ver = self.apt_client.get_best_binary_version(package)
@@ -417,11 +419,16 @@
         if pkg:
             pkg = pkg[0]
         else:
+            #TODO: Check if the elusive software is provided by another package.
             logging.error('Package %s not found.' % package)
             return downloads
 
-        # Add the package itself to be downloaded if it is not installed
-        downloads.append(pkg)
+        # Add the package itself to be downloaded if the latest is not installed
+        if self.__is_installed(package, '>=', ver):
+            print "%s is already the newest version" % (package)
+            return
+        else:
+            downloads.append(pkg)
 
         # We need to grab both the depends and recommends packages
         dependencies = []
@@ -430,9 +437,10 @@
         if pkg.has_key('recommends'):
             dependencies += pkg['recommends'].split(',')
 
-        # Iterate through each package
+        # Iterate through each dependency
         for dep in dependencies:
-            # Get "or" packages
+            # dep will hold a list of [name, version] tuples representing 
+            # several packages that can fill the dependency ("or" packages)
             dep = dep.split('|')
 
             # Build (name, version) tuples for each in this section
@@ -448,48 +456,43 @@
 
             found = False
             # Check if any of these are installed or ready to be downloaded
-            #TODO: Check the installed/download package's Provides as well
+            # If any is found, the dependency is taken care of, and we'll move
+            # onto the next dependency.
             for p in dep:
-                try:
-                    comparison, version = p[1].split()
-                    needed_version = DpkgVersion(version)
-                except: 
+                if len(p[1].split()) > 1:
+                    # A version is specified
+                    comparison, needed_version = p[1].split()
+                else: 
                     # We have no version specified
-                    comparison = '>>'
-                    needed_version = DpkgVersion('0')
-
-                # Test against status entries
-                #FIXME: Can we reference these through the backref install??
-                status_refs = self.session.query(Status). \
-                                filter(Status.proj_id==self.project_ref.id). \
-                                filter(Status.name==p[0]).all()
-
-                for ref in status_refs:
-                    installed_version = DpkgVersion(ref.version) 
-                    found = self.__compare_found(installed_version, 
-                                                 comparison, 
-                                                 needed_version)
+                    comparison = '>>'  #FIXME: Should this be '>=' ?
+                    needed_version = '0'
+
+                # Test against downloads
+                for d in downloads:
+                    if d['package'] == p[0]:
+                        # Matching package name, test its version against
+                        installed_version = d['version']
+                        found = self.__compare_found(installed_version, 
+                                                     comparison, 
+                                                     needed_version)
                     if found:
-                        break
-   
-                if not found:
-                    # Test against downloads
-                    for d in downloads:
-                        if d['package'] == p[0]:
-                            # Matching package name, test its version against
-                            installed_version = DpkgVersion(d['version'])
-                            found = self.__compare_found(installed_version, 
-                                                         comparison, 
-                                                         needed_version)
-                        if found:
-                            break
-
-                # We must have found it on the past iteration
+                        break  # Break out of this loop...
                 if found: 
+                    break  # Now break out of the bigger loop.
+
+                # See if this dependency is already installed
+                #TODO: upgrade if possible
+                if self.__is_installed(p[0], comparison, needed_version):
+                    # The package is installed, and dependency met. Move along.
+                    found = True
+                    break
+                    
+                if self.__should_upgrade(p[0], comparison, needed_version):
                     break
 
             if not found:
-                # Just grab the first package
+                # This dependency is not satisifed, so we should just get the
+                # first option among the "or" packages.
                 #print "Checking %s" % dep[0][0]
                 downloads = self.__calculate_downloads(downloads, dep[0][0])
                 
@@ -504,8 +507,41 @@
 
         return downloads
 
+    def __is_installed(self, package, comparison, version):
+        """Checks whether a package is installed"""
+        #TODO: Check provides as well
+        # Check against status entries
+        #FIXME: Can we reference these through the backref install??
+        status_refs = self.session.query(Status). \
+                        filter(Status.proj_id==self.project_ref.id). \
+                        filter(Status.name==package).all()
+
+        for ref in status_refs:
+            installed_version = ref.version
+            needed_version = version
+            found = self.__compare_found(installed_version, 
+                                            comparison, 
+                                            needed_version)
+            if found:
+                return True
+        return False
+        
+    def __should_upgrade(self, package, comparison, needed_version):
+        """Check whether there is a newer version available and whether
+           it fits the dependency
+        """
+        latest_version = self.apt_client.get_best_binary_version(package)[1]
+        if self.__is_installed(package, "<<", latest_version):
+            # The latest version is not installed
+            if self.__compare_found(latest_version, comparison, needed_version):
+                # The latest version fits the comparison
+                return True
+        return False
+
     def __compare_found(self, v1, comparison, v2):
         """Make a comparison between two versions and return the result"""
+        v1 = DpkgVersion(v1)
+        v2 = DpkgVersion(v2)
         if (comparison == '>>' and v1 > v2) or \
            (comparison == '>=' and v1 >= v2) or \
            (comparison == '=' and v1 == v2) or \
@@ -513,4 +549,3 @@
            (comparison == '<<' and v1 < v2): 
             return True
         return False
-