Download as
Browse Code »

Commit 2fc02b6c34f72f11dd8ead3a286943bf6102cd60

Authored by Antonio Terceiro
1 parent c83ebcea
Exists in r5_design and in 1 other branch design_41_backup

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