Download as
Browse Code »

Commit 2fc02b6c34f72f11dd8ead3a286943bf6102cd60

Authored by Antonio Terceiro
1 parent c83ebcea
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

fix upload task

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
@@ -34,10 +34,11 @@ $(build_packages): %-build : % @@ -34,10 +34,11 @@ $(build_packages): %-build : %
34 cp $*/*.patch ~/rpmbuild/SOURCES/ || true 34 cp $*/*.patch ~/rpmbuild/SOURCES/ || true
35 cd $* && $(BUILD_PREFIX) rpmbuild -bb $*.spec 35 cd $* && $(BUILD_PREFIX) rpmbuild -bb $*.spec
36 36
37 -$(upload_packages): %-upload : % checkout-%  
38 - (cd $(obsdir)/$(OBSPROJECT)/$* && osc remove *) 37 +$(upload_packages): %-upload : %-checkout
  38 + $(MAKE) $*-diff
  39 + @printf "Confirm upload? [y/N] "; read confirm; test "$$confirm" = y -o "$$confirm" = Y
39 cp $*/* $(obsdir)/$(OBSPROJECT)/$* 40 cp $*/* $(obsdir)/$(OBSPROJECT)/$*
40 - (cd $(obsdir)/$(OBSPROJECT)/$* && osc add * && osc commit -m "update $*") 41 + (cd $(obsdir)/$(OBSPROJECT)/$*; osc add *; osc commit -m "update $*")
41 42
42 $(diff_packages): %-diff : % 43 $(diff_packages): %-diff : %
43 @git diff --no-index $(obsdir)/$(OBSPROJECT)/$*/$*.spec $*/$*.spec || true 44 @git diff --no-index $(obsdir)/$(OBSPROJECT)/$*/$*.spec $*/$*.spec || true