APT: Add sources.list* to __important__ list

Frame: Fix bug in handling of __important__ entries

This should allow people the easier option of configuring their APT
sources in the /etc/sources.list.d dirctory instead of just relying on
sources.list to be correct. This commit also fixes a bug where the
client was relying on a 'ConfigFile' entry tag even in the case where a
Path entry was present.

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>

1 files changed, 14 insertions, 0 deletions

diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py
index b9fabc0ab..95544f8b9 100644
--- a/src/lib/Client/Frame.py
+++ b/src/lib/Client/Frame.py
@@ -108,6 +108,20 @@ class Frame:
                         except:
                             self.logger.error("Unexpected tool failure",
                                               exc_info=1)
+            for cfile in [cfl for cfl in config.findall(".//Path[@type='file']") \
+                          if cfl.get('name') in self.__important__]:
+                tl = [t for t in self.tools if t.handlesEntry(cfile) \
+                     and t.canVerify(cfile)]
+                if tl:
+                    if not tl[0].VerifyPath(cfile, []):
+                        if self.setup['interactive'] and not \
+                               promptFilter("Install %s: %s? (y/N):", [cfile]):
+                            continue
+                        try:
+                            self.states[cfile] = tl[0].InstallPath(cfile)
+                        except:
+                            self.logger.error("Unexpected tool failure",
+                                              exc_info=1)
         # find entries not handled by any tools
         problems = [entry for struct in config for \
                     entry in struct if entry not in self.handled]