summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-15 20:28:25 +0100
committervarac <varacanero@zeromail.org>2013-03-15 20:46:29 +0100
commit6bf7a6ab5d6e63f75c94f49aa0f12959e954efa8 (patch)
tree27f5320b7ab634d9bb7034a6b39e9373bce5f86f
parent7e8113b3fcf6f251ca9d5e2f39f43fd024058c97 (diff)
Revert "deploy /etc/apt/preferences before File['apt_config']"
This reverts commit 7e8113b3fcf6f251ca9d5e2f39f43fd024058c97. see https://leap.se/code/issues/1990 for the miserious details.
-rw-r--r--manifests/preferences.pp3
1 files changed, 1 insertions, 2 deletions
diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index 5cfaff2..9ed24c1 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -14,8 +14,7 @@ class apt::preferences {
# only update together
content => $pref_contents,
require => File['/etc/apt/sources.list'],
- owner => root, group => 0, mode => '0644',
- before => File['apt_config'];
+ owner => root, group => 0, mode => '0644';
}
}