6 files changed, 16 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/Comments.py b/src/lib/Bcfg2/Server/Lint/Comments.py
index 8bfb76461..85c4467ba 100644
--- a/src/lib/Bcfg2/Server/Lint/Comments.py
+++ b/src/lib/Bcfg2/Server/Lint/Comments.py
@@ -81,7 +81,7 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin):
         """ check properties files for required headers """
         if 'Properties' in self.core.plugins:
             props = self.core.plugins['Properties']
-            for propfile, pdata in props.store.entries.items():
+            for propfile, pdata in props.entries.items():
                 if os.path.splitext(propfile)[1] == ".xml":
                     self.check_xml(pdata.name, pdata.xdata, 'properties')
 
diff --git a/src/lib/Bcfg2/Server/Lint/MergeFiles.py b/src/lib/Bcfg2/Server/Lint/MergeFiles.py
index 44d02c2ff..2419c3d43 100644
--- a/src/lib/Bcfg2/Server/Lint/MergeFiles.py
+++ b/src/lib/Bcfg2/Server/Lint/MergeFiles.py
@@ -57,7 +57,7 @@ class MergeFiles(Bcfg2.Server.Lint.ServerPlugin):
         else:
             threshold = 0.75
         rv = []
-        elist = entries.items()
+        elist = list(entries.items())
         while elist:
             result = self._find_similar(elist.pop(0), copy.copy(elist),
                                         threshold)
diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py
index ae7c75804..91cfe2a56 100644
--- a/src/lib/Bcfg2/Server/Lint/Validate.py
+++ b/src/lib/Bcfg2/Server/Lint/Validate.py
@@ -121,6 +121,9 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
             cmd.extend(["--noout", "--schema", schemafile, filename])
             lint = Popen(cmd, stdout=PIPE, stderr=STDOUT)
             output = lint.communicate()[0]
+            # py3k fix
+            if not isinstance(output, str):
+                output = output.decode('utf-8')
             if lint.wait():
                 self.LintError("xml-failed-to-verify",
                                "%s fails to verify:\n%s" % (filename, output))
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
index bc2928fa6..a82a183d8 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
@@ -40,6 +40,11 @@ class AptCollection(Collection):
             else:
                 lines.append("deb %s %s %s" % (source.url, source.version,
                                                " ".join(source.components)))
+                if source.debsrc:
+                    lines.append("deb-src %s %s %s" %
+                                 (source.url,
+                                  source.version,
+                                  " ".join(source.components)))
                 lines.append("")
 
         return "\n".join(lines)
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
index 7ba374dd3..22073493c 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
@@ -158,6 +158,10 @@ class Source(Bcfg2.Server.Plugin.Debuggable):  # pylint: disable=R0902
         #: this source
         self.whitelist = [item.text for item in xsource.findall('Whitelist')]
 
+        #: Whether or not to include deb-src lines in the generated APT
+        #: configuration
+        self.debsrc = xsource.get('debsrc', 'false') == 'true'
+
         #: A dict of repository options that will be included in the
         #: configuration generated on the server side (if such is
         #: applicable; most backends do not generate any sort of
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index efbca28cd..d5773de97 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -9,7 +9,7 @@ import shutil
 import lxml.etree
 import Bcfg2.Logger
 import Bcfg2.Server.Plugin
-from Bcfg2.Compat import ConfigParser, urlopen, HTTPError
+from Bcfg2.Compat import ConfigParser, urlopen, HTTPError, URLError
 from Bcfg2.Server.Plugins.Packages.Collection import Collection, \
     get_collection_class
 from Bcfg2.Server.Plugins.Packages.PackagesSources import PackagesSources
@@ -459,7 +459,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
                     try:
                         open(localfile, 'w').write(urlopen(key).read())
                         keys.append(key)
-                    except HTTPError:
+                    except (URLError, HTTPError):
                         err = sys.exc_info()[1]
                         self.logger.error("Packages: Error downloading %s: %s"
                                           % (key, err))