misc-functions.sh: unwrap die messages
authorZac Medico <zmedico@gentoo.org>
Wed, 20 Jun 2012 21:56:49 +0000 (14:56 -0700)
committerZac Medico <zmedico@gentoo.org>
Wed, 20 Jun 2012 21:56:49 +0000 (14:56 -0700)
Jeremy Olexa <darkside@gentoo.org> complained that die was not handling
these line continuations as it's supposed to. Maybe there's a bug in
die's line continuation sed expression, but it won't hurt to unwrap
these particular messages.

bin/misc-functions.sh

index 564af856f8476ebbc3ccfa5c01c9d99f8a6bf4a4..9eec8bb691fb8ae2668bac6ea1d1a2993f10b544 100755 (executable)
@@ -773,16 +773,15 @@ install_qa_check() {
                fi
                if [[ ${abort} == "yes" ]] ; then
                        if [[ $gentoo_bug = yes || $always_overflow = yes ]] ; then
-                               die "install aborted due to" \
-                                       "severe warnings shown above"
+                               die "install aborted due to severe warnings shown above"
                        else
                                echo "Please do not file a Gentoo bug and instead" \
                                "report the above QA issues directly to the upstream" \
                                "developers of this software." | fmt -w 70 | \
                                while read -r line ; do eqawarn "${line}" ; done
                                eqawarn "Homepage: ${HOMEPAGE}"
-                               has stricter ${FEATURES} && die "install aborted due to" \
-                                       "severe warnings shown above"
+                               has stricter ${FEATURES} && \
+                                       die "install aborted due to severe warnings shown above"
                        fi
                fi
        fi