Merge branch 'update_puppet' of github.com:colab-community/colab into update_puppet

Sergio Oliveira
2 parents 6268701c a2e7f90c
Showing 1 changed file with 4 additions and 2 deletions Show diff stats
fabfile.py
@@ -167,11 +167,13 @@ def bootstrap():
  
     with settings(user=env.superuser):
         family = get_distro_family()
-        sudo(cmd(family, 'update'))
+        if(family == 'debian'):
+            sudo(cmd(family, 'update'))
+        else:
+            package_install('wget')
  
         if not exists('/usr/bin/git'):
             package_install('git-core')
-        package_install('wget')
  
         if env.is_vagrant:
             groups = ['sudo', 'vagrant']
...	...	@@ -167,11 +167,13 @@ def bootstrap():
167	167
168	168	with settings(user=env.superuser):
169	169	family = get_distro_family()
170		- sudo(cmd(family, 'update'))
	170	+ if(family == 'debian'):
	171	+ sudo(cmd(family, 'update'))
	172	+ else:
	173	+ package_install('wget')
171	174
172	175	if not exists('/usr/bin/git'):
173	176	package_install('git-core')
174		- package_install('wget')
175	177
176	178	if env.is_vagrant:
177	179	groups = ['sudo', 'vagrant']
...	...