X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=daklib%2Fcruft.py;h=a685bcb5545b27fb826a68b95db622190b109244;hb=013bd28f8a38603851e2bd01841fb9ee8af28d8b;hp=fc98eafbea857dc89baae84f7240b4879d0137d7;hpb=76b59a19769bc4468e528bb1e35623da2bc6ad5c;p=dak.git diff --git a/daklib/cruft.py b/daklib/cruft.py index fc98eafb..a685bcb5 100644 --- a/daklib/cruft.py +++ b/daklib/cruft.py @@ -28,10 +28,10 @@ from sqlalchemy.orm import object_session def newer_version(lowersuite_name, highersuite_name, session): ''' - Finds newer or equal versions in lowersuite_name than in highersuite_name. - Returns a list of tuples (source, higherversion, lowerversion) where - higherversion is the newest version from highersuite_name and lowerversion - is the newest version from lowersuite_name. + Finds newer versions in lowersuite_name than in highersuite_name. Returns a + list of tuples (source, higherversion, lowerversion) where higherversion is + the newest version from highersuite_name and lowerversion is the newest + version from lowersuite_name. ''' lowersuite = get_suite(lowersuite_name, session) @@ -43,10 +43,12 @@ def newer_version(lowersuite_name, highersuite_name, session): list = [] for (source, higherversion) in query: lowerversion = session.query(func.max(DBSource.version)). \ - filter_by(source = source).filter(DBSource.version >= higherversion). \ + filter_by(source = source).filter(DBSource.version > higherversion). \ with_parent(lowersuite).group_by(DBSource.source).scalar() if lowerversion is not None: list.append((source, higherversion, lowerversion)) + + list.sort() return list def get_package_names(suite):