diff --git a/ChangeLog b/ChangeLog index e1dbf36a..acf51e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2009-03-24 Bahadır Kandemir + * Allow disabling delta package support from pisi.conf + 2009-03-24 Bahadır Kandemir * Merged COMAR patch. PiSi now has a cleaner comar interface module. diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index 496d15ca..29906f19 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -81,8 +81,12 @@ 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") + # If delta exists than use the delta uri. - if delta: + if delta and not ignore_delta: pkg_uri = delta.packageURI pkg_hash = delta.packageHash else: diff --git a/pisi/configfile.py b/pisi/configfile.py index 93faf9ba..1fafec92 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -75,6 +75,7 @@ class GeneralDefaults: package_cache = False package_cache_limit = 0 bandwidth_limit = 0 + ignore_delta = False class BuildDefaults: """Default values for [build] section"""