From 0f49c12491bd4fd23fee18b06dd3b8bc6e83c62a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bahad=C4=B1r=20Kandemir?= Date: Tue, 24 Mar 2009 12:25:53 +0000 Subject: [PATCH] Add "ignore_delta=True" under "general" section in /etc/pisi/pisi.conf to disable delta package support. --- ChangeLog | 3 +++ pisi/atomicoperations.py | 6 +++++- pisi/configfile.py | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) 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"""