Download as
Browse Code »

Commit 2fc02b6c34f72f11dd8ead3a286943bf6102cd60

Authored by Antonio Terceiro
1 parent c83ebcea
Exists in master and in 54 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

fix upload task

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
Makefile
  Diff comments   View file @2fc02b6
... ... @@ -34,10 +34,11 @@ $(build_packages): %-build : %
34 34 cp $*/*.patch ~/rpmbuild/SOURCES/ || true
35 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 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 43 $(diff_packages): %-diff : %
43 44 @git diff --no-index $(obsdir)/$(OBSPROJECT)/$*/$*.spec $*/$*.spec || true
... ...