From a5453e5928430b35e2f607b4416ae2a3e1b99ba6 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Sun, 7 Jun 2009 13:31:32 +0000 Subject: [PATCH] ignore_delta fix (thanks to Gokcen) --- pisi/atomicoperations.py | 4 +--- pisi/operations/helper.py | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index 29906f19..c66b84aa 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -81,9 +81,7 @@ class Install(AtomicOperation): (version, release, build) = installdb.get_version(pkg.name) delta = pkg.get_delta(buildFrom=build) - # Check if delta is enabled in pisi.conf - config = pisi.configfile.ConfigurationFile("/etc/pisi/pisi.conf") - ignore_delta = config.get("general", "ignore_delta") + ignore_delta = ctx.config.values.general.ignore_delta # If delta exists than use the delta uri. if delta and not ignore_delta: diff --git a/pisi/operations/helper.py b/pisi/operations/helper.py index 681cd7c1..24913e14 100644 --- a/pisi/operations/helper.py +++ b/pisi/operations/helper.py @@ -87,7 +87,9 @@ def calculate_download_sizes(order): (version, release, build) = installdb.get_version(pkg.name) delta = pkg.get_delta(buildFrom=build) - if delta: + ignore_delta = ctx.config.values.general.ignore_delta + + if delta and not ignore_delta: fn = os.path.basename(delta.packageURI) pkg_hash = delta.packageHash pkg_size = delta.packageSize