correct hardcoded read in operations/install.py too
This commit is contained in:
@@ -157,15 +157,15 @@ def install_pkg_files(package_URIs, reinstall = False):
|
|||||||
dfn[name] = x
|
dfn[name] = x
|
||||||
|
|
||||||
# check packages' DistributionReleases and Architecture
|
# check packages' DistributionReleases and Architecture
|
||||||
config = pisi.configfile.ConfigurationFile("/etc/pisi/pisi.conf")
|
|
||||||
for x in d_t.keys():
|
for x in d_t.keys():
|
||||||
pkg = d_t[x]
|
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.') \
|
raise Exception(_('Package %s is not compatible with your distribution release %s %s.') \
|
||||||
% (x, config.get("general", "distribution"), config.get("general", "distribution_release")))
|
% (x, ctx.config.values.get("general", "distribution"), \
|
||||||
if pkg.architecture != config.get("general", "architecture"):
|
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.') \
|
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):
|
def satisfiesDep(dep):
|
||||||
# is dependency satisfied among available packages
|
# is dependency satisfied among available packages
|
||||||
|
|||||||
Reference in New Issue
Block a user