Skip to content

Commit ad3e042

Browse files
author
Morgan Haskel
committed
Merge pull request puppetlabs#647 from bmjen/unpin-apt
Unpins apt 1.8 dependency in fixtures.yml and spec_helper_acceptance.
2 parents 35d474f + db9c778 commit ad3e042

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.fixtures.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
fixtures:
22
repositories:
3-
apt:
4-
repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
5-
branch: "1.8.x"
3+
apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
64
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
75
firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
86
concat: "https://github.com/puppetlabs/puppetlabs-concat.git"

spec/spec_helper_acceptance.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def psql(psql_cmd, user = 'postgres', exit_codes = [0,1], &block)
9999
end
100100

101101
on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
102-
on host, puppet('module','install','puppetlabs-apt', '--version', '1.8.0', '--force'), { :acceptable_exit_codes => [0,1] }
102+
on host, puppet('module','install','puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
103103
on host, puppet('module','install','--force','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
104104
end
105105

0 commit comments

Comments
 (0)