From 2fc02b6c34f72f11dd8ead3a286943bf6102cd60 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 25 Jun 2015 15:34:15 -0300 Subject: [PATCH] fix upload task --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8ddd5ec..a8f2175 100644 --- a/Makefile +++ b/Makefile @@ -34,10 +34,11 @@ $(build_packages): %-build : % cp $*/*.patch ~/rpmbuild/SOURCES/ || true cd $* && $(BUILD_PREFIX) rpmbuild -bb $*.spec -$(upload_packages): %-upload : % checkout-% - (cd $(obsdir)/$(OBSPROJECT)/$* && osc remove *) +$(upload_packages): %-upload : %-checkout + $(MAKE) $*-diff + @printf "Confirm upload? [y/N] "; read confirm; test "$$confirm" = y -o "$$confirm" = Y cp $*/* $(obsdir)/$(OBSPROJECT)/$* - (cd $(obsdir)/$(OBSPROJECT)/$* && osc add * && osc commit -m "update $*") + (cd $(obsdir)/$(OBSPROJECT)/$*; osc add *; osc commit -m "update $*") $(diff_packages): %-diff : % @git diff --no-index $(obsdir)/$(OBSPROJECT)/$*/$*.spec $*/$*.spec || true -- libgit2 0.21.2