Download as
Browse Code »

Commit a343765fb70741093442afefd21a24b77acef588

Authored by Charles Oliveira
1 parent a8037785
Exists in master and in 13 other branches Validation_colab_sprint_30, check-port, generic-plugins, header_footer, mezuro-integration, move_out_plugins, plugin_extra_configs, proxy_base_template, proxy_hotspot, spb-release/3.0, stable, test, trac_indexing

Removed return 0 at end of main

Showing 1 changed file with 1 additions and 2 deletions   Show diff stats
puppet/bootstrap.py
  Diff comments   View file @a343765
@@ -151,7 +151,7 @@ def main(): @@ -151,7 +151,7 @@ def main():
151 result = subprocess.call(install) 151 result = subprocess.call(install)
152 if result != 0: 152 if result != 0:
153 print('Failed installing puppet') 153 print('Failed installing puppet')
154 - return result 154 + exit(result)
155 155
156 if os.path.isfile('/vagrant/puppet/hiera.yaml'): 156 if os.path.isfile('/vagrant/puppet/hiera.yaml'):
157 copyfile('/vagrant/puppet/hiera.yaml', '/etc/puppet/hiera.yaml') 157 copyfile('/vagrant/puppet/hiera.yaml', '/etc/puppet/hiera.yaml')
@@ -159,7 +159,6 @@ def main(): @@ -159,7 +159,6 @@ def main():
159 locale.setlocale(locale.LC_ALL, '') 159 locale.setlocale(locale.LC_ALL, '')
160 160
161 install_puppet_modules() 161 install_puppet_modules()
162 - return 0  
163 162
164 163
165 if __name__ == '__main__': 164 if __name__ == '__main__':