Merge branch 'maint'

Conflicts:
	debian/changelog
	doc/conf.py
	doc/releases/index.txt
	doc/server/database.txt
	doc/server/plugins/generators/cfg.txt
	doc/server/plugins/generators/sslca.txt
	man/bcfg2.conf.5
	misc/bcfg2-selinux.spec
	misc/bcfg2.spec
	osx/Makefile
	osx/macports/Portfile
	schemas/packages.xsd
	solaris-ips/MANIFEST.bcfg2-server.header
	solaris-ips/MANIFEST.bcfg2.header
	solaris-ips/Makefile
	solaris-ips/pkginfo.bcfg2
	solaris-ips/pkginfo.bcfg2-server
	solaris/Makefile
	solaris/pkginfo.bcfg2
	solaris/pkginfo.bcfg2-server
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Proxy.py
	src/lib/Bcfg2/Client/Tools/APT.py
	src/lib/Bcfg2/Client/Tools/Action.py
	src/lib/Bcfg2/Client/Tools/SYSV.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Reporting/Collector.py
	src/lib/Bcfg2/Reporting/templates/base.html
	src/lib/Bcfg2/Server/Admin/__init__.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/settings.py
	src/lib/Bcfg2/version.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 14 insertions, 5 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
index 24db2963d..67ada2399 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
@@ -199,6 +199,9 @@ class Source(Debuggable):  # pylint: disable=R0902
         #: The "version" attribute from :attr:`xsource`
         self.version = xsource.get('version', '')
 
+        #: The "name" attribute from :attr:`xsource`
+        self.name = xsource.get('name', None)
+
         #: A list of predicates that are used to determine if this
         #: source applies to a given
         #: :class:`Bcfg2.Server.Plugins.Metadata.ClientMetadata`
@@ -274,11 +277,11 @@ class Source(Debuggable):  # pylint: disable=R0902
         for arch in self.arches:
             if self.url:
                 usettings = [dict(version=self.version, component=comp,
-                                  arch=arch)
+                                  arch=arch, debsrc=self.debsrc)
                              for comp in self.components]
             else:  # rawurl given
                 usettings = [dict(version=self.version, component=None,
-                                  arch=arch)]
+                                  arch=arch, debsrc=self.debsrc)]
 
             for setting in usettings:
                 if not self.rawurl:
@@ -286,6 +289,7 @@ class Source(Debuggable):  # pylint: disable=R0902
                 else:
                     setting['baseurl'] = self.rawurl
                 setting['url'] = baseurl % setting
+                setting['name'] = self.get_repo_name(setting)
             self.url_map.extend(usettings)
 
     @property
@@ -353,7 +357,7 @@ class Source(Debuggable):  # pylint: disable=R0902
             if os.path.exists(self.cachefile):
                 try:
                     self.load_state()
-                except:
+                except (OSError, cPickle.UnpicklingError):
                     err = sys.exc_info()[1]
                     self.logger.error("Packages: Cachefile %s load failed: %s"
                                       % (self.cachefile, err))
@@ -388,8 +392,10 @@ class Source(Debuggable):  # pylint: disable=R0902
         doing other operations that require repository names.  This
         function tries several approaches:
 
-        #. First, if the map contains a ``component`` key, use that as
-           the name.
+        #. First, if the source element containts a ``name`` attribute,
+           use that as the name.
+        #. If the map contains a ``component`` key, use that as the
+           name.
         #. If not, then try to match the repository URL against
            :attr:`Bcfg2.Server.Plugins.Packages.Source.REPO_RE`.  If
            that succeeds, use the first matched group; additionally,
@@ -419,6 +425,9 @@ class Source(Debuggable):  # pylint: disable=R0902
         :type url_map: dict
         :returns: string - the name of the repository.
         """
+        if self.name:
+            return self.name
+
         if url_map['component']:
             rname = url_map['component']
         else: