diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-06-20 14:56:49 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-20 14:56:49 -0700 |
| commit | 131b3b6718baa058f06d4f0ac8f919f717ae5338 (patch) | |
| tree | 2cd504890899e790dfc33ed700df50324c317876 /bin | |
| parent | backtracking: only feedback first slot conflict (diff) | |
| download | portage-131b3b6718baa058f06d4f0ac8f919f717ae5338.tar.gz portage-131b3b6718baa058f06d4f0ac8f919f717ae5338.tar.bz2 portage-131b3b6718baa058f06d4f0ac8f919f717ae5338.zip | |
misc-functions.sh: unwrap die messages
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.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/misc-functions.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 564af856f..9eec8bb69 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -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 |