diff options
Diffstat (limited to 'src/lib/Client/Frame.py')
| -rw-r--r-- | src/lib/Client/Frame.py | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py index d17f70f1b..5826b36e8 100644 --- a/src/lib/Client/Frame.py +++ b/src/lib/Client/Frame.py @@ -162,14 +162,8 @@ class Frame: return self.__dict__[name] raise AttributeError(name) - def InstallImportant(self): - """Install important entries - - We also process the decision mode stuff here because we want to prevent - non-whitelisted/blacklisted 'important' entries from being installed - prior to determining the decision mode on the client. - """ - # Need to process decision stuff early so that dryrun mode works with it + def GenerateActions(self): + """Generate list of all entries that have to be handled""" self.whitelist = [entry for entry in self.states \ if not self.states[entry]] if not self.setup['file']: @@ -190,6 +184,16 @@ class Frame: 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] + def InstallImportant(self): + """Install important entries + + We also process the decision mode stuff here because we want to prevent + non-whitelisted/blacklisted 'important' entries from being installed + prior to determining the decision mode on the client. + """ + # Need to process decision stuff early so that dryrun mode works with it + self.GenerateActions() + # take care of important entries first if not self.dryrun and not self.setup['bundle']: for cfile in [cfl for cfl in self.config.findall(".//Path") \ @@ -411,6 +415,9 @@ class Frame: self.CondDisplayState('initial') self.InstallImportant() self.Decide() + if self.modified: + self.Inventory() + self.GenerateActions() self.Install() self.times['install'] = time.time() self.Remove() |