aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-04 00:09:28 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-04 00:09:28 +0100
commit0a4117b76a6c9954a4d893789308034f29f1db47 (patch)
tree767d3ba228cc2e06c0237a8d05a0060d755053ad
parent8fe5ce1d7211b98fbec2de757301195c61c4daf8 (diff)
downloadpaludis-0a4117b76a6c9954a4d893789308034f29f1db47.tar.gz
paludis-0a4117b76a6c9954a4d893789308034f29f1db47.tar.xz
Make pkg_pretend output prettier
-rw-r--r--paludis/repositories/e/ebuild.cc1
-rw-r--r--paludis/repositories/e/ebuild/4/pkg_pretend.bash2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_pretend.bash4
3 files changed, 2 insertions, 5 deletions
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index f5a788b..7246209 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -1119,6 +1119,7 @@ void
EbuildPretendCommand::extend_command(Process & process)
{
process
+ .extra_newlines_if_any_output_exists()
.prefix_stdout(stringify(params.package_id()->name().package()) + "-" +
stringify(params.package_id()->version()) + "> ")
.prefix_stderr(stringify(params.package_id()->name().package()) + "-" +
diff --git a/paludis/repositories/e/ebuild/4/pkg_pretend.bash b/paludis/repositories/e/ebuild/4/pkg_pretend.bash
index 18ab429..36add04 100644
--- a/paludis/repositories/e/ebuild/4/pkg_pretend.bash
+++ b/paludis/repositories/e/ebuild/4/pkg_pretend.bash
@@ -35,9 +35,7 @@ ebuild_f_pretend()
if hasq "pretend" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping pkg_pretend (SKIP_FUNCTIONS)"
else
- echo
pkg_pretend
- echo
fi
true
}
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_pretend.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_pretend.bash
index fababda..55b228f 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_pretend.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_pretend.bash
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007, 2008 Ciaran McCreesh
+# Copyright (c) 2007, 2008, 2011 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
@@ -32,9 +32,7 @@ exheres_internal_pretend()
if hasq "pretend" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping pkg_pretend (SKIP_FUNCTIONS)"
else
- echo
pkg_pretend
- echo
fi
true