From 78d18ecc08972e5a56d9213d75b31034b4cbbe6c Mon Sep 17 00:00:00 2001 From: Mamoru Sakaue / MwGhennndo Date: Wed, 1 Aug 2018 18:47:17 +0800 Subject: [PATCH] Corrected the broken functionality of skipping reinetallation/installatopn of ports whose requirements are missing. Changes to be committed: modified: lib/libmain.sh modified: lib/libreinstall.sh --- lib/libmain.sh | 2 +- lib/libreinstall.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libmain.sh b/lib/libmain.sh index 8fc1fbd..44937e0 100644 --- a/lib/libmain.sh +++ b/lib/libmain.sh @@ -12,7 +12,7 @@ main_set_version () MYVERSION=4.1.0 COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9])$' # Template for development versions - MYVERSION=4.0.0+toward_4.1.0_20180801182758 + MYVERSION=4.0.0+toward_4.1.0_20180801184658 COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$' } diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh index b889137..568e282 100644 --- a/lib/libreinstall.sh +++ b/lib/libreinstall.sh @@ -1281,7 +1281,7 @@ reinstall_exec () sed 's/@.*//' "$REINSTALL_DBNODE_DIR/requirements.all.full" \ > ${TMPDIR}/reinstall_exec::requirements.all_but_test.unflavored || : if reinstall_make missing 2> /dev/null \ - | grep -Fx "${TMPDIR}/reinstall_exec::requirements.all_but_test.unflavored" \ + | grep -Fx -f "${TMPDIR}/reinstall_exec::requirements.all_but_test.unflavored" \ > ${TMPDIR}/reinstall_exec::missing_requirements then message_echo "Found missing requirements:" -- 2.11.0