From 7997ae385a997c3c73bc018a6193fb77362ce4b5 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Thu, 13 Jun 2013 00:50:46 +0200
Subject: Plugins/Packages: ability to overwrite recommended flag per package

---
 src/lib/Bcfg2/Server/Plugins/Packages/Apt.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'src/lib/Bcfg2/Server/Plugins/Packages/Apt.py')

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
index c1d53a78e..434e175d8 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
@@ -71,11 +71,9 @@ class AptSource(Source):
 
     def read_files(self):
         bdeps = dict()
+        brecs = dict()
         bprov = dict()
         self.essentialpkgs = set()
-        depfnames = ['Depends', 'Pre-Depends']
-        if self.recommended:
-            depfnames.append('Recommends')
         for fname in self.files:
             if not self.rawurl:
                 barch = [x
@@ -87,6 +85,7 @@ class AptSource(Source):
                 barch = self.arches[0]
             if barch not in bdeps:
                 bdeps[barch] = dict()
+                brecs[barch] = dict()
                 bprov[barch] = dict()
             try:
                 reader = gzip.GzipFile(fname)
@@ -101,9 +100,10 @@ class AptSource(Source):
                     pkgname = words[1].strip().rstrip()
                     self.pkgnames.add(pkgname)
                     bdeps[barch][pkgname] = []
+                    brecs[barch][pkgname] = []
                 elif words[0] == 'Essential' and self.essential:
                     self.essentialpkgs.add(pkgname)
-                elif words[0] in depfnames:
+                elif words[0] in ['Depends', 'Pre-Depends', 'Recommends']:
                     vindex = 0
                     for dep in words[1].split(','):
                         if '|' in dep:
@@ -114,17 +114,24 @@ class AptSource(Source):
                                                              barch,
                                                              vindex)
                             vindex += 1
-                            bdeps[barch][pkgname].append(dyn_dname)
+
+                            if words[0] == 'Recommends':
+                                brecs[barch][pkgname].append(dyn_dname)
+                            else:
+                                bdeps[barch][pkgname].append(dyn_dname)
                             bprov[barch][dyn_dname] = set(cdeps)
                         else:
                             raw_dep = re.sub(r'\(.*\)', '', dep)
                             raw_dep = raw_dep.rstrip().strip()
-                            bdeps[barch][pkgname].append(raw_dep)
+                            if words[0] == 'Recommends':
+                                brecs[barch][pkgname].append(raw_dep)
+                            else:
+                                bdeps[barch][pkgname].append(raw_dep)
                 elif words[0] == 'Provides':
                     for pkg in words[1].split(','):
                         dname = pkg.rstrip().strip()
                         if dname not in bprov[barch]:
                             bprov[barch][dname] = set()
                         bprov[barch][dname].add(pkgname)
-        self.process_files(bdeps, bprov)
+        self.process_files(bdeps, bprov, brecs)
     read_files.__doc__ = Source.read_files.__doc__
-- 
cgit v1.2.3-1-g7c22