diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2010-06-10 20:26:24 +0000 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2010-06-10 17:52:27 -0500 |
| commit | ee502ffe4e27906fc7fdc13992293ef5359c6e59 (patch) | |
| tree | 751e6b29b0d60d2a656725210c4a870c767d9a01 /src/lib | |
| parent | 827151ffa0d16aa50d4074fb981c78966da138a7 (diff) | |
| download | bcfg2-ee502ffe4e27906fc7fdc13992293ef5359c6e59.tar.gz bcfg2-ee502ffe4e27906fc7fdc13992293ef5359c6e59.tar.bz2 bcfg2-ee502ffe4e27906fc7fdc13992293ef5359c6e59.zip | |
APT: Fix nonexistent Path verification failures (Reported by Remi Broemeling)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5919 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Client/Tools/APT.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Client/Tools/APT.py index 3f02242ce..b9498e513 100644 --- a/src/lib/Client/Tools/APT.py +++ b/src/lib/Client/Tools/APT.py @@ -53,6 +53,8 @@ class APT(Bcfg2.Client.Tools.Tool): [entry.get('name') for struct in config for entry in struct \ if entry.tag in ['Path', 'ConfigFile'] and \ entry.get('name').startswith('%s/apt/sources.list' % etc_path)] + self.nonexistent = [entry.get('name') for struct in config for entry in struct \ + if entry.tag == 'Path' and entry.get('type') == 'nonexistent'] os.environ["DEBIAN_FRONTEND"] = 'noninteractive' self.actions = {} if self.setup['kevlar'] and not self.setup['dryrun']: @@ -87,6 +89,10 @@ class APT(Bcfg2.Client.Tools.Tool): files.append(item.split()[3]) elif "can't open" in item: files.append(item.split()[5]) + elif "missing file" in item and \ + item.split()[3] in self.nonexistent: + # these files should not exist + continue elif "is not installed" in item or "missing file" in item: self.logger.error("Package %s is not fully installed" \ % entry.get('name')) |