diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-11-01 00:06:17 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <asulfrian@zedat.fu-berlin.de> | 2022-01-23 19:57:33 +0100 |
| commit | 830007663cf2d83ccaa58f9c6caa8f461f6d8234 (patch) | |
| tree | 3733bd0ff4b80b469ee6c5d3e4e46f3c2646329f | |
| parent | 3842939e7d94373a8a4d4214072c9b24b1e32b6d (diff) | |
| download | bcfg2-830007663cf2d83ccaa58f9c6caa8f461f6d8234.tar.gz bcfg2-830007663cf2d83ccaa58f9c6caa8f461f6d8234.tar.bz2 bcfg2-830007663cf2d83ccaa58f9c6caa8f461f6d8234.zip | |
Packages: Add priority to sources and sort them
| -rw-r--r-- | schemas/packages.xsd | 10 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Source.py | 9 |
3 files changed, 19 insertions, 2 deletions
diff --git a/schemas/packages.xsd b/schemas/packages.xsd index fc5a1356c..3f2fe4f57 100644 --- a/schemas/packages.xsd +++ b/schemas/packages.xsd @@ -225,6 +225,16 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute type="xsd:integer" name="priority"> + <xsd:annotation> + <xsd:documentation> + The priority of the source. This is used to order the + sources. After sorting, the first source, that could + deliver the package, is used. If not supplied the default + priority is 500. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> <xsd:attributeGroup ref="py:genshiAttrs"/> </xsd:complexType> diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py index 1af046ec0..d982626d0 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py @@ -106,6 +106,8 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile): source = self.source_from_xml(xsource) if source is not None: self.entries.append(source) + self.entries.sort(key=(lambda source: source.priority), + reverse=True) Index.__doc__ = Bcfg2.Server.Plugin.StructFile.Index.__doc__ + """ ``Index`` is responsible for calling :func:`source_from_xml` diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py index c80604d01..b2422d84e 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py @@ -195,6 +195,9 @@ class Source(Debuggable): # pylint: disable=R0902 #: The "name" attribute from :attr:`xsource` self.name = None + #: The "priority" attribute from :attr:`xsource` + self.priority = xsource.get('priority', 500) + #: A list of predicates that are used to determine if this #: source applies to a given #: :class:`Bcfg2.Server.Plugins.Metadata.ClientMetadata` @@ -257,11 +260,13 @@ class Source(Debuggable): # pylint: disable=R0902 for arch in self.arches: if self.url: usettings = [dict(version=self.version, component=comp, - arch=arch, debsrc=self.debsrc) + arch=arch, debsrc=self.debsrc, + priority=self.priority) for comp in self.components] else: # rawurl given usettings = [dict(version=self.version, component=None, - arch=arch, debsrc=self.debsrc)] + arch=arch, debsrc=self.debsrc, + priority=self.priority)] for setting in usettings: if not self.rawurl: |