From 169d6472f79932091e869e59c91b6f29960fdc3a Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 12 Nov 2015 22:40:59 +0100 Subject: [bug] don't install ruby-hiera-puppet on jessie - Resolves: #6922 --- lib/leap_cli/remote/tasks.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/leap_cli/remote/tasks.rb b/lib/leap_cli/remote/tasks.rb index 49b1cfd..b4d05d8 100644 --- a/lib/leap_cli/remote/tasks.rb +++ b/lib/leap_cli/remote/tasks.rb @@ -57,7 +57,7 @@ task :install_prerequisites, :max_hosts => MAX_HOSTS do run "( test -f /etc/init.d/ntp && /etc/init.d/ntp start ) || true" end leap.log :installing, "required packages" do - run %[#{apt_get} install $( (grep -q wheezy /etc/debian_version && echo #{leap.required_wheezy_packages}) || echo #{leap.required_packages} )] + run %[#{apt_get} install $( (egrep -q '(^wheezy|^7\.)' /etc/debian_version && echo #{leap.required_wheezy_packages}) || echo #{leap.required_packages} )] end #run "locale-gen" leap.mkdirs("/etc/leap", "/srv/leap") @@ -72,4 +72,4 @@ task :skip_errors_task, :on_error => :continue, :max_hosts => MAX_HOSTS do end task :standard_task, :max_hosts => MAX_HOSTS do -end \ No newline at end of file +end -- cgit v1.2.3