From b4d0e0e3b4bfa2436e3f76a591d5639819a4853b Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 4 May 2015 15:11:46 -0700
Subject: remove ruby-hiera-puppet from list of required packages (except for
wheezy) closes #6918
---
lib/leap_cli/remote/leap_plugin.rb | 4 ++++
lib/leap_cli/remote/tasks.rb | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
(limited to 'lib/leap_cli')
diff --git a/lib/leap_cli/remote/leap_plugin.rb b/lib/leap_cli/remote/leap_plugin.rb
index c155097..e425842 100644
--- a/lib/leap_cli/remote/leap_plugin.rb
+++ b/lib/leap_cli/remote/leap_plugin.rb
@@ -6,6 +6,10 @@
module LeapCli; module Remote; module LeapPlugin
def required_packages
+ "puppet rsync lsb-release locales"
+ end
+
+ def required_wheezy_packages
"puppet ruby-hiera-puppet rsync lsb-release locales"
end
diff --git a/lib/leap_cli/remote/tasks.rb b/lib/leap_cli/remote/tasks.rb
index 38a440c..ab60a51 100644
--- a/lib/leap_cli/remote/tasks.rb
+++ b/lib/leap_cli/remote/tasks.rb
@@ -58,7 +58,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 #{leap.required_packages}"
+ run %[#{apt_get} install $( (grep -q wheezy /etc/debian_version && echo #{leap.required_wheezy_packages}) || echo #{leap.required_packages} )]
end
#run "locale-gen"
leap.mkdirs("/etc/leap", "/srv/leap")
--
cgit v1.2.3