diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index 06e82bee..6d480f53 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -79,8 +79,10 @@ class Install(AtomicOperation): installdb = pisi.db.installdb.InstallDB() # Package is installed. This is an upgrade. Check delta. if installdb.has_package(pkg.name): - (version, release, build) = installdb.get_version(pkg.name) - delta = pkg.get_delta(buildFrom=build) + (version, release, build, distro, distro_release) = installdb.get_version_and_distro_release(pkg.name) + # pisi distro upgrade should not use delta support + if distro == pkg.distro and distro_release == pkg.distributionRelease: + delta = pkg.get_delta(buildFrom=build) ignore_delta = ctx.config.values.general.ignore_delta diff --git a/pisi/operations/helper.py b/pisi/operations/helper.py index 24913e14..d889392c 100644 --- a/pisi/operations/helper.py +++ b/pisi/operations/helper.py @@ -84,8 +84,10 @@ def calculate_download_sizes(order): delta = None if installdb.has_package(pkg.name): - (version, release, build) = installdb.get_version(pkg.name) - delta = pkg.get_delta(buildFrom=build) + (version, release, build, distro, distro_release) = installdb.get_version_and_distro_release(pkg.name) + # pisi distro upgrade should not use delta support + if distro == pkg.distro and distro_release == pkg.distributionRelease: + delta = pkg.get_delta(buildFrom=build) ignore_delta = ctx.config.values.general.ignore_delta