diff options
author | mh <mh@immerda.ch> | 2014-04-18 11:00:04 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2014-04-18 11:00:04 +0200 |
commit | 53e78e61fefefe85939a3c3b5efcd147deebca61 (patch) | |
tree | 89cd9a9dd8aedff5d0fbb692139c6d5ef8f82450 | |
parent | af616677e6558d1ad2bfdcdf02dc318bec192363 (diff) | |
parent | 98ad878c1a0d2dfbeb9ff91d155ac759e12f1d4e (diff) | |
download | puppet-apt-53e78e61fefefe85939a3c3b5efcd147deebca61.tar.gz puppet-apt-53e78e61fefefe85939a3c3b5efcd147deebca61.tar.bz2 |
Merge remote-tracking branch 'shared/master'
l--------- | templates/Debian/apticron_jessie.erb | 1 | ||||
l--------- | templates/Debian/listchanges_jessie.erb | 1 | ||||
-rw-r--r-- | templates/Debian/preferences_jessie.erb | 14 |
3 files changed, 16 insertions, 0 deletions
diff --git a/templates/Debian/apticron_jessie.erb b/templates/Debian/apticron_jessie.erb new file mode 120000 index 0000000..a9a3a6f --- /dev/null +++ b/templates/Debian/apticron_jessie.erb @@ -0,0 +1 @@ +apticron_wheezy.erb
\ No newline at end of file diff --git a/templates/Debian/listchanges_jessie.erb b/templates/Debian/listchanges_jessie.erb new file mode 120000 index 0000000..74ab496 --- /dev/null +++ b/templates/Debian/listchanges_jessie.erb @@ -0,0 +1 @@ +listchanges_lenny.erb
\ No newline at end of file diff --git a/templates/Debian/preferences_jessie.erb b/templates/Debian/preferences_jessie.erb new file mode 100644 index 0000000..4f8e95c --- /dev/null +++ b/templates/Debian/preferences_jessie.erb @@ -0,0 +1,14 @@ +Explanation: Debian <%= codename=scope.lookupvar('apt::codename') %> +Package: * +Pin: release o=Debian,n=<%= codename %> +Pin-Priority: 990 + +Explanation: Debian sid +Package: * +Pin: release o=Debian,n=sid +Pin-Priority: 1 + +Explanation: Debian fallback +Package: * +Pin: release o=Debian +Pin-Priority: -10 |