From e545190de3099c48f9a58cf0f8d451ccb6ef9018 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Thu, 25 Apr 2019 15:19:53 -0700 Subject: [PATCH] Fixups for autospecnew - Run git commands within the newly created package repo - Only run these commands if autospec succeeds Signed-off-by: Patrick McCarty --- Makefile.toplevel | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.toplevel b/Makefile.toplevel index 363c411..cb2c023 100644 --- a/Makefile.toplevel +++ b/Makefile.toplevel @@ -226,10 +226,12 @@ autospecnew: preautospecnew-checks localreponotice $${SETVERSION:+ --version $${SETVERSION}} \ ${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \ $(URL); \ - [ $$? -eq 0 ] && $(MAKE) link-new-rpms PKG_REPO_DIR="${TOPLVL}/packages/${NAME}"; \ - $(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \ - git diff | grep -q index || python3 $(TOPLVL)/projects/common/patchfilter.py > for-review.txt ; \ - git diff | grep -q index || python3 $(TOPLVL)/projects/common/patchfilter.py ; \ + if [ $$? -eq 0 ]; then \ + $(MAKE) link-new-rpms PKG_REPO_DIR="${TOPLVL}/packages/${NAME}"; \ + $(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \ + python3 $(TOPLVL)/projects/common/patchfilter.py <(git -C $(TOPLVL)/packages/$(NAME) show) > $(TOPLVL)/packages/$(NAME)/for-review.txt; \ + python3 $(TOPLVL)/projects/common/patchfilter.py <(git -C $(TOPLVL)/packages/$(NAME) show); \ + fi; \ else \ echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \ exit 1; \