diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 17:03:57 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 17:03:57 +0100 |
| commit | 10c7939f65ae8e2f771d83d54c4ba56108bc509e (patch) | |
| tree | 4c66514e6adfece27e5111d1e296009e94405c6f /files | |
| parent | 3de76e7b05224b9696a75908b0a4259349e20823 (diff) | |
| parent | 5d54dfdd88d1e87681b317db16b20ad20b8c88f7 (diff) | |
| download | puppet-apt-10c7939f65ae8e2f771d83d54c4ba56108bc509e.tar.gz puppet-apt-10c7939f65ae8e2f771d83d54c4ba56108bc509e.tar.bz2 | |
Merge remote branch 'immerda/master'.
Conflicts:
README
files/preferences
templates/Debian/sources.list.deb-src.erb
templates/Debian/sources.list.volatile.erb
templates/Ubuntu/sources.list.backports.erb
templates/Ubuntu/sources.list.deb-src.erb
Diffstat (limited to 'files')
| -rw-r--r-- | files/02show_upgraded | 4 | ||||
| -rw-r--r-- | files/03clean | 4 | ||||
| -rw-r--r-- | files/preferences_snippet.erb | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/files/02show_upgraded b/files/02show_upgraded index eb046b2..bb127d4 100644 --- a/files/02show_upgraded +++ b/files/02show_upgraded @@ -1,4 +1,4 @@ -# This file is brought to you by Puppet -# all local modifications will be overwritten +// This file is managed by Puppet +// all local modifications will be overwritten APT::Get::Show-Upgraded true; diff --git a/files/03clean b/files/03clean index d878375..3d20924 100644 --- a/files/03clean +++ b/files/03clean @@ -1,4 +1,4 @@ -# This file is brought to you by Puppet -# all local modifications will be overwritten +// This file is managed by Puppet +// all local modifications will be overwritten DSelect::Clean auto; diff --git a/files/preferences_snippet.erb b/files/preferences_snippet.erb deleted file mode 100644 index 4dfb701..0000000 --- a/files/preferences_snippet.erb +++ /dev/null @@ -1,4 +0,0 @@ -Package: <%= name %> -Pin: release a=<%= release %> -Pin-Priority: <%= priority %> - |