From 6bc5718c25a75afb1f5d69435b9439b2e178e4e3 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Thu, 25 Apr 2019 18:21:11 +0000 Subject: [PATCH] Add patchfilter to autsopecnew --- Makefile.common | 4 ++-- Makefile.toplevel | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index 1a51689..4698d2c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -186,8 +186,8 @@ autospec: preautospec-checks pullrebase localreponotice clean-old-content bash update_changelog.sh ; \ git commit --amend --no-edit Change* ; \ fi - 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 ; + git show | grep -q index || python3 $(TOPLVL)/projects/common/patchfilter.py > for-review.txt ; + git show | grep -q index || python3 $(TOPLVL)/projects/common/patchfilter.py ; #help autospecnogit: Runs autospec, but does not create a commit autospecnogit: diff --git a/Makefile.toplevel b/Makefile.toplevel index 41d539e..6faa363 100644 --- a/Makefile.toplevel +++ b/Makefile.toplevel @@ -228,6 +228,8 @@ autospecnew: preautospecnew-checks localreponotice $(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 show | grep -q index || python3 $(TOPLVL)/projects/common/patchfilter.py > for-review.txt ; \ + git show | grep -q index || python3 $(TOPLVL)/projects/common/patchfilter.py ; \ else \ echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \ exit 1; \