diff options
9 files changed, 28 insertions, 11 deletions
diff --git a/paludis/repositories/e/ebuild/0/output_functions.bash b/paludis/repositories/e/ebuild/0/output_functions.bash index b6cee47b9..17aab0e7f 100644 --- a/paludis/repositories/e/ebuild/0/output_functions.bash +++ b/paludis/repositories/e/ebuild/0/output_functions.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: set sw=4 sts=4 et : -# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh +# Copyright (c) 2006, 2007, 2008, 2010 Ciaran McCreesh # # This file is part of the Paludis package manager. Paludis is free software; # you can redistribute it and/or modify it under the terms of the GNU General @@ -25,6 +25,7 @@ ebuild_notice() ebuild_section() { echo -ne "${COLOUR_GREEN}>>>${COLOUR_NORMAL} " + paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_GREEN}>>>${COLOUR_NORMAL} $@" >/dev/null echo "$@" } diff --git a/paludis/repositories/e/ebuild/1/output_functions.bash b/paludis/repositories/e/ebuild/1/output_functions.bash index 47e20c15d..d6e3cbcd7 100644 --- a/paludis/repositories/e/ebuild/1/output_functions.bash +++ b/paludis/repositories/e/ebuild/1/output_functions.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: set sw=4 sts=4 et : -# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh +# Copyright (c) 2006, 2007, 2008, 2010 Ciaran McCreesh # # This file is part of the Paludis package manager. Paludis is free software; # you can redistribute it and/or modify it under the terms of the GNU General @@ -25,6 +25,7 @@ ebuild_notice() ebuild_section() { echo -ne "${COLOUR_BLUE}>>>${COLOUR_NORMAL} " + paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_BLUE}>>>${COLOUR_NORMAL} $@" >/dev/null echo "$@" } diff --git a/paludis/repositories/e/ebuild/2/output_functions.bash b/paludis/repositories/e/ebuild/2/output_functions.bash index 498257b7e..fc23b7ad3 100644 --- a/paludis/repositories/e/ebuild/2/output_functions.bash +++ b/paludis/repositories/e/ebuild/2/output_functions.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: set sw=4 sts=4 et : -# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh +# Copyright (c) 2006, 2007, 2008, 2010 Ciaran McCreesh # # This file is part of the Paludis package manager. Paludis is free software; # you can redistribute it and/or modify it under the terms of the GNU General @@ -25,6 +25,7 @@ ebuild_notice() ebuild_section() { echo -ne "${COLOUR_BROWN}>>>${COLOUR_NORMAL} " + paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_BROWN}>>>${COLOUR_NORMAL} $@" >/dev/null echo "$@" } diff --git a/paludis/repositories/e/ebuild/3/output_functions.bash b/paludis/repositories/e/ebuild/3/output_functions.bash index 11772ab77..550c3ec19 100644 --- a/paludis/repositories/e/ebuild/3/output_functions.bash +++ b/paludis/repositories/e/ebuild/3/output_functions.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: set sw=4 sts=4 et : -# Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh +# Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh # # This file is part of the Paludis package manager. Paludis is free software; # you can redistribute it and/or modify it under the terms of the GNU General @@ -25,6 +25,7 @@ ebuild_notice() ebuild_section() { echo -ne "${COLOUR_DARK_BLUE}>>>${COLOUR_NORMAL} " + paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_DARK_BLUE}>>>${COLOUR_NORMAL} $@" >/dev/null echo "$@" } diff --git a/paludis/repositories/e/ebuild/4/output_functions.bash b/paludis/repositories/e/ebuild/4/output_functions.bash index dec0f3f8a..aa61bc816 100644 --- a/paludis/repositories/e/ebuild/4/output_functions.bash +++ b/paludis/repositories/e/ebuild/4/output_functions.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: set sw=4 sts=4 et : -# Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh +# Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh # # This file is part of the Paludis package manager. Paludis is free software; # you can redistribute it and/or modify it under the terms of the GNU General @@ -25,6 +25,7 @@ ebuild_notice() ebuild_section() { echo -ne "${COLOUR_PURPLE}>>>${COLOUR_NORMAL} " + paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_PURPLE}>>>${COLOUR_NORMAL} $@" >/dev/null echo "$@" } diff --git a/paludis/repositories/e/ebuild/exheres-0/output_functions.bash b/paludis/repositories/e/ebuild/exheres-0/output_functions.bash index 2fd560a43..4c4a2475b 100644 --- a/paludis/repositories/e/ebuild/exheres-0/output_functions.bash +++ b/paludis/repositories/e/ebuild/exheres-0/output_functions.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: set sw=4 sts=4 et : -# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh +# Copyright (c) 2006, 2007, 2008, 2010 Ciaran McCreesh # # This file is part of the Paludis package manager. Paludis is free software; # you can redistribute it and/or modify it under the terms of the GNU General @@ -25,5 +25,6 @@ ebuild_notice() ebuild_section() { echo -ne "${COLOUR_PINK}===${COLOUR_NORMAL} " + paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_PINK}===${COLOUR_NORMAL} $@" >/dev/null echo "$@" } diff --git a/paludis/repositories/e/ebuild/output_functions.bash b/paludis/repositories/e/ebuild/output_functions.bash index b6cee47b9..17aab0e7f 100644 --- a/paludis/repositories/e/ebuild/output_functions.bash +++ b/paludis/repositories/e/ebuild/output_functions.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: set sw=4 sts=4 et : -# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh +# Copyright (c) 2006, 2007, 2008, 2010 Ciaran McCreesh # # This file is part of the Paludis package manager. Paludis is free software; # you can redistribute it and/or modify it under the terms of the GNU General @@ -25,6 +25,7 @@ ebuild_notice() ebuild_section() { echo -ne "${COLOUR_GREEN}>>>${COLOUR_NORMAL} " + paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_GREEN}>>>${COLOUR_NORMAL} $@" >/dev/null echo "$@" } diff --git a/paludis/repositories/e/ebuild/paludis-1/output_functions.bash b/paludis/repositories/e/ebuild/paludis-1/output_functions.bash index 8debf77a1..3b8acee07 100644 --- a/paludis/repositories/e/ebuild/paludis-1/output_functions.bash +++ b/paludis/repositories/e/ebuild/paludis-1/output_functions.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: set sw=4 sts=4 et : -# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh +# Copyright (c) 2006, 2007, 2008, 2010 Ciaran McCreesh # # This file is part of the Paludis package manager. Paludis is free software; # you can redistribute it and/or modify it under the terms of the GNU General @@ -25,6 +25,7 @@ ebuild_notice() ebuild_section() { echo -ne "${COLOUR_YELLOW}===${COLOUR_NORMAL} " + paludis_pipe_command LOG "$EAPI" "status" "${COLOUR_YELLOW}===${COLOUR_NORMAL} $@" >/dev/null echo "$@" } diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc index 9a9b0bc38..639fba1ee 100644 --- a/paludis/repositories/e/pipe_command_handler.cc +++ b/paludis/repositories/e/pipe_command_handler.cc @@ -210,9 +210,18 @@ paludis::erepository::pipe_command_handler(const Environment * const environment } else { - Log::get_instance()->message("e.child.message", destringify<LogLevel>(tokens[2]), lc_context) - << join(next(next(next(tokens.begin()))), tokens.end(), " "); - return "O0;"; + if (tokens[2] == "status") + { + if (maybe_output_manager) + maybe_output_manager->message(mt_status, join(next(next(next(tokens.begin()))), tokens.end(), " ")); + return "O0;"; + } + else + { + Log::get_instance()->message("e.child.message", destringify<LogLevel>(tokens[2]), lc_context) + << join(next(next(next(tokens.begin()))), tokens.end(), " "); + return "O0;"; + } } } else if (tokens[0] == "MESSAGE") |