Skip to content

Commit d37280b

Browse files
committed
lower prio for debian version, purge legacy
1 parent 84ae55f commit d37280b

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

spec/acceptance/class_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def nodesource_unsupported(nodejs_version)
4545
repo_priority =
4646
if %w[16 18 20].include?(nodejs_version) && fact('os.family') == 'Debian' && %w[12 13].include?(fact('os.release.major'))
4747
'1000'
48+
elsif fact('os.family') == 'Debian'
49+
'1'
4850
else
4951
'undef'
5052
end
@@ -54,7 +56,7 @@ def nodesource_unsupported(nodejs_version)
5456
<<-PUPPET
5557
class { 'nodejs':
5658
repo_version => '#{nodejs_version}',
57-
repo_priority => #{repo_priority},
59+
repo_priority => '#{repo_priority}',
5860
}
5961
PUPPET
6062
end

spec/support/acceptance/purge.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
def purge_node
44
case fact('osfamily')
55
when 'Debian'
6-
on default, 'apt-get purge -y libnode*', { acceptable_exit_codes: [0, 100] }
6+
on default, 'apt-get purge -y libnode* nodejs-legacy', { acceptable_exit_codes: [0, 100] }
77
end
88
end

0 commit comments

Comments
 (0)