Skip to content

Commit 7ab5be8

Browse files
author
Morgan Haskel
committed
Merge pull request puppetlabs#618 from tphoney/apt_fix
Apt fix
2 parents df2886e + 900b085 commit 7ab5be8

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

.fixtures.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
fixtures:
22
repositories:
3-
apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
3+
apt:
4+
repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
5+
branch: "1.8.x"
46
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
57
firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
68
concat: "https://github.com/puppetlabs/puppetlabs-concat.git"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ spec/fixtures/
66
.bundle/
77
coverage/
88
.idea/
9+
log/
910
*.iml

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'), { :acceptable_exit_codes => [0,1] }
102+
on host, puppet('module','install','puppetlabs-apt', '--version', '1.8.0', '--force'), { :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)