Ticket #846: bcfg2-action-always.patch

src/lib/Client/Frame.py

@@ -56 +56 @@
                    isinstance(driver, types.StringType):
                 self.logger.error("Tool driver %s is not available" % driver)
                 drivers.remove(driver)
-                
+
         tclass = {}
         for tool in drivers:
             if not isinstance(tool, types.StringType):
@@ -95 +95 @@
                 if tl:
                     if not tl[0].VerifyConfigFile(cfile, []):
                         if self.setup['interactive'] and not \
-                               promptFilter("Install %s: %s? (y/N):", [cfile]): 
-                            continue 
+                               promptFilter("Install %s: %s? (y/N):", [cfile]):
+                            continue
                         try:
                             self.states[cfile] = tl[0].InstallConfigFile(cfile)
                         except:
@@ -120 +120 @@
             self.logger.debug("The following entries are included multiple times:")
             self.logger.debug(["%s:%s" % entry for entry in multi])
             self.logger.debug("")
-            
-                    
+
+
     def __getattr__(self, name):
         if name in ['extra', 'handled', 'modified', '__important__']:
             ret = []
@@ -175 +175 @@
                 self.logger.info("In blacklist mode: suppressing installation of:")
                 self.logger.info(["%s:%s" % (e.tag, e.get('name')) for e in b_to_rem])
                 self.whitelist = [x for x in self.whitelist if x not in b_to_rem]
-            
+
         if self.dryrun:
             if self.whitelist:
                 self.logger.info("In dryrun mode: suppressing entry installation for:")
@@ -223 +223 @@
                     [self.whitelist.remove(ent) for ent in b_to_remv]
 
         if self.setup['interactive']:
-            self.whitelist = promptFilter(prompt, self.whitelist) 
-            self.removal = promptFilter(rprompt, self.removal) 
+            self.whitelist = promptFilter(prompt, self.whitelist)
+            self.removal = promptFilter(rprompt, self.removal)
 
         for entry in candidates:
             if entry not in self.whitelist:
@@ -270 +270 @@
                     self.DispatchInstallCalls(clobbered)
 
         for bundle in self.config.findall('.//Bundle'):
+            if self.setup['bundle'] and bundle not in self.setup['bundle']:
+                # prune out unspecified bundles when running with -b
+                continue
             for tool in self.tools:
                 try:
                     if bundle in mbundles:
@@ -279 +282 @@
                 except:
                     self.logger.error("%s.BundleNotUpdated() call failed:" % \
                                       (tool.__name__), exc_info=1)
-                
+
     def Remove(self):
         '''Remove extra entries'''
         for tool in self.tools:
@@ -303 +306 @@
         if phase == 'final' and self.setup['extra']:
             self.logger.info(["%s:%s" % (entry.tag, entry.get('name')) \
                               for entry in self.extra])
-                
+
         self.logger.info("")
 
         if ((self.states.values().count(False) == 0) and not self.extra):