minor refinement

This commit is contained in:
David Rose 2009-12-20 18:59:18 +00:00
parent fd6e2fc82a
commit c60b5e7b6e

View File

@ -1356,7 +1356,10 @@ uninstall_packages() {
Packages::const_iterator pi; Packages::const_iterator pi;
for (pi = _packages.begin(); pi != _packages.end(); ++pi) { for (pi = _packages.begin(); pi != _packages.end(); ++pi) {
P3DPackage *package = (*pi); P3DPackage *package = (*pi);
package->uninstall(); if (package != _image_package && package != _certlist_package &&
package != _p3dcert_package) {
package->uninstall();
}
} }
} }
@ -1372,12 +1375,17 @@ uninstall_packages() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void P3DInstance:: void P3DInstance::
uninstall_host() { uninstall_host() {
uninstall_packages();
set<P3DHost *> hosts; set<P3DHost *> hosts;
Packages::const_iterator pi; Packages::const_iterator pi;
for (pi = _packages.begin(); pi != _packages.end(); ++pi) { for (pi = _packages.begin(); pi != _packages.end(); ++pi) {
P3DPackage *package = (*pi); P3DPackage *package = (*pi);
hosts.insert(package->get_host()); if (package != _image_package && package != _certlist_package &&
package != _p3dcert_package) {
hosts.insert(package->get_host());
}
} }
set<P3DHost *>::iterator hi; set<P3DHost *>::iterator hi;