aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-27 14:44:31 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-27 14:45:55 +0100
commit45982c5c46dc9e1470cdf258a04e578b6a3e359c (patch)
tree8d18b96553aa5d5366484788022c1656fb77a736
parent8313ede1be8ef1851977c37a0dddf2d5ebcb9b79 (diff)
downloadpaludis-45982c5c46dc9e1470cdf258a04e578b6a3e359c.tar.gz
paludis-45982c5c46dc9e1470cdf258a04e578b6a3e359c.tar.xz
Send ebuild sections as status messages
Fixes: ticket:977
-rw-r--r--paludis/repositories/e/ebuild/0/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/1/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/2/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/3/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/4/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/output_functions.bash3
-rw-r--r--paludis/repositories/e/ebuild/paludis-1/output_functions.bash3
-rw-r--r--paludis/repositories/e/pipe_command_handler.cc15
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 b6cee47..17aab0e 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 47e20c1..d6e3cbc 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 498257b..fc23b7a 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 11772ab..550c3ec 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 dec0f3f..aa61bc8 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 2fd560a..4c4a247 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 b6cee47..17aab0e 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 8debf77..3b8acee 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 9a9b0bc..639fba1 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")