summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcmue81 <cmue81@gmx.de>2013-08-03 09:20:14 -0400
committerAnthony G. Basile <blueness@gentoo.org>2013-08-03 09:22:01 -0400
commit3c9308d811778b1cd051bb8370f92dd842cf478d (patch)
tree5fdfcedc7fcd4c2012ebeab98ed67a40723dc4de
parentWebappConfig/{config.py,server.py}: set server uid/gid in the config (diff)
downloadwebapp-config-3c9308d811778b1cd051bb8370f92dd842cf478d.tar.gz
webapp-config-3c9308d811778b1cd051bb8370f92dd842cf478d.tar.bz2
webapp-config-3c9308d811778b1cd051bb8370f92dd842cf478d.zip
WebappConfig/wrapper.py: fix paludis support
X-Gentoo-Bug: 428378 X-Gentoo-Bug-URL: https://bugs.gentoo.org/428378
-rw-r--r--WebappConfig/wrapper.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/WebappConfig/wrapper.py b/WebappConfig/wrapper.py
index 623f37a..a9e2a3b 100644
--- a/WebappConfig/wrapper.py
+++ b/WebappConfig/wrapper.py
@@ -52,7 +52,7 @@ def config_protect(cat, pn, pvr, pm):
return portage.settings['CONFIG_PROTECT']
elif pm == "paludis":
- cmd="paludis --log-level silent --no-color --environment-variable %s/%s CONFIG_PROTECT" % (cat,pn)
+ cmd="cave print-id-environment-variable -b --format '%%v\n' --variable-name CONFIG_PROTECT %s/%s" % (cat,pn)
fi, fo, fe = os.popen3(cmd)
fi.close()
@@ -97,7 +97,7 @@ def get_root(config):
pn = config.maybe_get('pn')
if cat and pn:
- cmd="paludis --log-level silent --no-color --environment-variable %s/%s ROOT" % (cat,pn)
+ cmd="cave print-id-environment-variable -b --format '%%v\n' --variable-name ROOT %s/%s" % (cat,pn)
fi, fo, fe = os.popen3(cmd)
fi.close()
@@ -141,7 +141,7 @@ def package_installed(full_name, pm):
elif pm == "paludis":
- cmd="paludis --best-version %s" % (full_name)
+ cmd="cave print-best-version '%s'" % (full_name)
fi, fo, fe = os.popen3(cmd)
fi.close()