diff options
| -rw-r--r-- | gentoo/bcfg2-1.0.0_rc2.ebuild | 5 | ||||
| -rw-r--r-- | src/lib/Client/Tools/Portage.py | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/gentoo/bcfg2-1.0.0_rc2.ebuild b/gentoo/bcfg2-1.0.0_rc2.ebuild index 6b366dcb0..c482a5d70 100644 --- a/gentoo/bcfg2-1.0.0_rc2.ebuild +++ b/gentoo/bcfg2-1.0.0_rc2.ebuild @@ -20,7 +20,7 @@ IUSE="server" DEPEND=">=dev-lang/python-2.5" RDEPEND="app-portage/gentoolkit - || ( dev-python/ssl-py26 >=dev-lang/python-2.6 ) + >=dev-lang/python-2.6 server? ( dev-python/lxml app-admin/gam-server )" @@ -45,11 +45,10 @@ src_install() { } pkg_postinst () { - depscan.sh use server && einfo "If this is a new installation, you probably need to run: " use server && einfo " bcfg2-admin init" } pkg_postrm () { - depscan.sh + python_mod_cleanup } diff --git a/src/lib/Client/Tools/Portage.py b/src/lib/Client/Tools/Portage.py index f5224c06a..9dc9df8ff 100644 --- a/src/lib/Client/Tools/Portage.py +++ b/src/lib/Client/Tools/Portage.py @@ -60,11 +60,10 @@ class Portage(Bcfg2.Client.Tools.PkgTool): def RemovePackages(self, packages): '''Deal with extra configuration detected''' + pkgnames = " ".join([pkg.get('name') for pkg in packages]) if len(packages) > 0: self.logger.info('Removing packages:') - self.logger.info(packages) - self.cmd.run("emerge --unmerge --quiet =%s" % " =".join(packages)) + self.logger.info(pkgnames) + self.cmd.run("emerge --unmerge --quiet %s" % " ".join(pkgnames.split(' '))) self.RefreshPackages() self.extra = self.FindExtraPackages() - - |