ignore_delta fix (thanks to Gokcen)
This commit is contained in:
@@ -81,9 +81,7 @@ class Install(AtomicOperation):
|
|||||||
(version, release, build) = installdb.get_version(pkg.name)
|
(version, release, build) = installdb.get_version(pkg.name)
|
||||||
delta = pkg.get_delta(buildFrom=build)
|
delta = pkg.get_delta(buildFrom=build)
|
||||||
|
|
||||||
# Check if delta is enabled in pisi.conf
|
ignore_delta = ctx.config.values.general.ignore_delta
|
||||||
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 exists than use the delta uri.
|
||||||
if delta and not ignore_delta:
|
if delta and not ignore_delta:
|
||||||
|
|||||||
@@ -87,7 +87,9 @@ def calculate_download_sizes(order):
|
|||||||
(version, release, build) = installdb.get_version(pkg.name)
|
(version, release, build) = installdb.get_version(pkg.name)
|
||||||
delta = pkg.get_delta(buildFrom=build)
|
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)
|
fn = os.path.basename(delta.packageURI)
|
||||||
pkg_hash = delta.packageHash
|
pkg_hash = delta.packageHash
|
||||||
pkg_size = delta.packageSize
|
pkg_size = delta.packageSize
|
||||||
|
|||||||
Reference in New Issue
Block a user