summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2013-03-01 01:07:05 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2013-03-06 04:52:35 +0100
commitb945f2bdae3790c22fe3ed11f5c5d0164306e261 (patch)
tree244a7a4cbbfee7076d1dc5715fcc6577e4499057
parent78a3a18194b98ca85af69f3f1afcd327c730b5f3 (diff)
downloadbcfg2-b945f2bdae3790c22fe3ed11f5c5d0164306e261.tar.gz
bcfg2-b945f2bdae3790c22fe3ed11f5c5d0164306e261.tar.bz2
bcfg2-b945f2bdae3790c22fe3ed11f5c5d0164306e261.zip
Packages/Apt: add pin attribute for extra pinning information
-rw-r--r--debian/changelog6
-rw-r--r--schemas/packages.xsd1
-rw-r--r--src/lib/Server/Plugins/Packages/Apt.py4
3 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 60891735a..8f2659589 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.2.3-7) unstable; urgency=low
+
+ * Packages/Apt: add pin attribute for extra pinning information
+
+ -- Alexander Sulfrian <alex@spline.inf.fu-berlin.de> Fri, 01 Mar 2013 01:08:16 +0100
+
bcfg2 (1.2.3-6) unstable; urgency=low
* Packages/Apt: add priority to additional_info
diff --git a/schemas/packages.xsd b/schemas/packages.xsd
index 59fa635c9..88bbaeec2 100644
--- a/schemas/packages.xsd
+++ b/schemas/packages.xsd
@@ -43,6 +43,7 @@
<xsd:attribute type="xsd:string" name="version"/>
<xsd:attribute type="xsd:integer" name="priority"/>
<xsd:attribute type="xsd:string" name="name"/>
+ <xsd:attribute type="xsd:string" name="pin"/>
</xsd:complexType>
<xsd:complexType name="groupType">
diff --git a/src/lib/Server/Plugins/Packages/Apt.py b/src/lib/Server/Plugins/Packages/Apt.py
index 7d7a42304..bbb84ad8e 100644
--- a/src/lib/Server/Plugins/Packages/Apt.py
+++ b/src/lib/Server/Plugins/Packages/Apt.py
@@ -15,6 +15,7 @@ class AptSource(Source):
def __init__(self, basepath, xsource, config):
Source.__init__(self, basepath, xsource, config)
+ self.pin = xsource.get('pin', '')
self.pkgnames = set()
self.recommends = dict()
@@ -22,7 +23,8 @@ class AptSource(Source):
'version': self.version,
'components': self.components,
'arches': self.arches,
- 'priority': self.priority}]
+ 'priority': self.priority,
+ 'pin': self.pin}]
def save_state(self):
cache = file(self.cachefile, 'wb')