OSDN Git Service

Bug fix to the previous modification.
authorMamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Sat, 7 Jul 2018 17:01:46 +0000 (01:01 +0800)
committerMamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Sat, 7 Jul 2018 17:01:46 +0000 (01:01 +0800)
 Changes to be committed:
modified:   lib/libreinstall.sh

lib/libreinstall.sh

index 32f2df3..1755aac 100644 (file)
@@ -1159,8 +1159,11 @@ reinstall_exec ()
                pkgsys_get_conflicting_installed_pkgs build "$REINSTALL_ORIGIN" \
                        | reinstall_backup_and_delete_conflicts
                message_echo "Checking whether any required package is missing..."
-               sed 's/@.*//' "$REINSTALL_DBNODE_DIR/requirements.all.full" > ${TMPDIR}/reinstall_exec::requirements.all.full # For filtering only build and run-time requirements, namely, excluding test requirements
-               reinstall_make missing 2> /dev/null | grep -Fx "${TMPDIR}/reinstall_exec::requirements.all.full" > ${TMPDIR}/reinstall_exec::missing_requirements
+               sed 's/@.*//' "$REINSTALL_DBNODE_DIR/requirements.all.full" \
+                       > ${TMPDIR}/reinstall_exec::requirements.all_but_test.unflavored || :
+               reinstall_make missing 2> /dev/null | \
+                       grep -Fx "${TMPDIR}/reinstall_exec::requirements.all_but_test.unflavored" \
+                       > ${TMPDIR}/reinstall_exec::missing_requirements
                if [ `wc -l < ${TMPDIR}/reinstall_exec::missing_requirements` -gt 0 ]
                then
                        message_echo "Found missing requirements:"