Download as
Browse Code »

Commit a343765fb70741093442afefd21a24b77acef588

Authored by Charles Oliveira
1 parent a8037785
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

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__':