Remove eblank nonsense

svn path=/main/trunk/; revision=10694

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 5851a55c7c6d56cac734fc54d94516837150f438..1eacf4414b34ac9e9ffcd9d616a9cb8d6ecd8583 100755 (executable)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -161,7 +161,7 @@ elog_base() {
        local messagetype
        [ -z "${1}" -o -z "${T}" -o ! -d "${T}/logging" ] && return 1
        case "${1}" in
-               BLANK|INFO|WARN|ERROR|LOG|QA)
+               INFO|WARN|ERROR|LOG|QA)
                        messagetype="${1}"
                        shift
                        ;;
@@ -174,15 +174,6 @@ elog_base() {
        return 0
 }
 
-eblank() {
-       [[ ${LAST_E_CMD} == "eblank" ]] && return 0
-       elog_base BLANK
-       [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
-       echo -e " ${BLANK}*${NORMAL}"
-       LAST_E_CMD="eblank"
-       return 0
-}
-
 eqawarn() {
        elog_base QA "$*"
        [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo

diff --git a/pym/portage/elog/messages.py b/pym/portage/elog/messages.py
index 341a61d1f2820dd526d8c433d06a4afa9d03ce32..d33542ef1e455d94386231c392e09f8aba806a12 100644 (file)
--- a/pym/portage/elog/messages.py
+++ b/pym/portage/elog/messages.py
@@ -43,8 +43,10 @@ def collect_ebuild_messages(path):
                                writemsg("!!! malformed entry in " + \
                                        "log file: '%s'\n" % filename, noiselevel=-1)
                                continue
+
                        if lastmsgtype is None:
                                lastmsgtype = msgtype
+                       
                        if msgtype == lastmsgtype:
                                msgcontent.append(msg)
                        else:

diff --git a/pym/portage/elog/mod_echo.py b/pym/portage/elog/mod_echo.py
index 1c83600a45e80b59fb36599afd38660b6e2fcba8..30d88f005067224f973864f68af17a8231bd7747 100644 (file)
--- a/pym/portage/elog/mod_echo.py
+++ b/pym/portage/elog/mod_echo.py
@@ -33,8 +33,7 @@ def finalize(mysettings=None):
                                                "WARN": printer.ewarn,
                                                "ERROR": printer.eerror,
                                                "LOG": printer.einfo,
-                                               "QA": printer.ewarn,
-                                               "BLANK": printer.eblank}
+                                               "QA": printer.ewarn}
                                if isinstance(msgcontent, basestring):
                                        msgcontent = [msgcontent]
                                for line in msgcontent:

diff --git a/pym/portage/output.py b/pym/portage/output.py
index 4d0ab42ec9716c5e545e639fdb954c082e12b9d9..482747e35ecebb9fcb70ac48c857517873327c01 100644 (file)
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -544,20 +544,6 @@ class EOutput(object):
                        sys.stdout.flush()
                self.__last_e_cmd = "ewarn"
 
-       def eblank(self, msg):
-               """
-               Shows a blank line. Consecutive eblank calls are all collapsed
-               into a single blank line.
-               """
-               if self.__last_e_cmd == "eblank":
-                       return
-               if not self.quiet:
-                       if self.__last_e_cmd == "ebegin":
-                               sys.stdout.write("\n")
-                       sys.stdout.write(colorize("BLANK", " * ") + "\n")
-                       sys.stdout.flush()
-               self.__last_e_cmd = "eblank"
-
        def ewend(self, errno, *msg):
                """
                Indicates the completion of a process, optionally displaying a message