Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge branch '1.5.x' of https://github.com/puppetlabs/puppetlabs-apt into 1.5.x
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index c778b6fd4b17c0fe66344277edf0a4169c00adbc..5f5d0ac49f839f5c76b9444dbd9cd44b159c80db 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-86,7
+86,7
@@
class apt(
notify => Exec['apt_update'],
}
notify => Exec['apt_update'],
}
- if $purge_preferences
== true
{
+ if $purge_preferences {
file { 'apt-preferences':
ensure => absent,
path => "${root}/preferences",
file { 'apt-preferences':
ensure => absent,
path => "${root}/preferences",
@@
-134,7
+134,7
@@
class apt(
owner => root,
group => root,
}
owner => root,
group => root,
}
-
+
file { 'old-proxy-file':
ensure => absent,
path => "${apt_conf_d}/proxy",
file { 'old-proxy-file':
ensure => absent,
path => "${apt_conf_d}/proxy",