From de89e8d435b713cf9746d6556bc9a20adf9ff577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serdar=20Dalg=C4=B1=C3=A7?= Date: Mon, 14 Dec 2009 13:23:11 +0000 Subject: [PATCH] correct hardcoded read in operations/install.py too --- pisi/operations/install.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pisi/operations/install.py b/pisi/operations/install.py index 0fd08f7d..533a6f49 100644 --- a/pisi/operations/install.py +++ b/pisi/operations/install.py @@ -157,15 +157,15 @@ def install_pkg_files(package_URIs, reinstall = False): dfn[name] = x # check packages' DistributionReleases and Architecture - config = pisi.configfile.ConfigurationFile("/etc/pisi/pisi.conf") for x in d_t.keys(): pkg = d_t[x] - if pkg.distributionRelease != config.get("general", "distribution_release"): + if pkg.distributionRelease != ctx.config.values.get("general", "distribution_release"): raise Exception(_('Package %s is not compatible with your distribution release %s %s.') \ - % (x, config.get("general", "distribution"), config.get("general", "distribution_release"))) - if pkg.architecture != config.get("general", "architecture"): + % (x, ctx.config.values.get("general", "distribution"), \ + ctx.config.values.get("general", "distribution_release"))) + if pkg.architecture != ctx.config.values.get("general", "architecture"): raise Exception(_('Package %s (%s) is not compatible with your %s architecture.') \ - % (x, pkg.architecture, config.get("general", "architecture"))) + % (x, pkg.architecture, ctx.config.values.get("general", "architecture"))) def satisfiesDep(dep): # is dependency satisfied among available packages