From ee9b29a2ed5fe8dcd5e01dc8002adfc027379ef2 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 29 Sep 2005 18:46:18 +0000 Subject: add support for tracking extra config info properly (Logical change 1.328) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1338 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Solaris.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/Client/Solaris.py b/src/lib/Client/Solaris.py index 13b55afa3..2ac09a119 100644 --- a/src/lib/Client/Solaris.py +++ b/src/lib/Client/Solaris.py @@ -191,16 +191,19 @@ class Solaris(Toolset): sysvrmpkgs = [pkg for pkg in self.pkgwork['remove'] if self.ptypes[pkg] == 'sysv'] enrmpkgs = [pkg for pkg in self.pkgwork['remove'] if self.ptypes[pkg] == 'encap'] if sysvrmpkgs: - system("/usr/sbin/pkgrm -n %s" % " ".join(sysvrmpkgs)) + if not system("/usr/sbin/pkgrm -n %s" % " ".join(sysvrmpkgs)): + [self.pkgwork['remove'].remove(pkg) for pkg in sysvrmpkgs] if enrmpkgs: - system("/local/sbin/epkg -l -q -r %s" % " ".join(enrmpkgs)) + if not system("/local/sbin/epkg -l -q -r %s" % " ".join(enrmpkgs)): + [self.pkgwork['remove'].remove(pkg) for pkg in enrmpkgs] else: self.CondPrint('verbose', "Need to remove packages: %s" % (self.pkgwork['remove'])) if len(self.extra_services) > 0: if self.setup['remove'] in ['all', 'services']: self.CondPrint('verbose', "Removing services: %s" % (self.extra_services)) for service in self.extra_services: - system("/usr/sbin/svcadm disable %s" % service) + if not system("/usr/sbin/svcadm disable %s" % service): + self.extra_services.remove(service) else: self.CondPrint('verbose', "Need to remove services: %s" % (self.extra_services)) -- cgit v1.2.3-1-g7c22