aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunichi Uekawa <dancer@dancer64.netfort.gr.jp>2007-05-17 20:40:01 +0900
committerJunichi Uekawa <dancer@dancer64.netfort.gr.jp>2007-05-17 20:40:01 +0900
commite1f51cc9978f23daae3de89df4efc21446f7bd55 (patch)
tree4400fa07c92cfc4011391bae6074ccedab42bd36
parentfb49987a3a0772ddf957b4d8a0ea6cd561671262 (diff)
downloadpbuilder-e1f51cc9978f23daae3de89df4efc21446f7bd55.tar
pbuilder-e1f51cc9978f23daae3de89df4efc21446f7bd55.tar.gz
use tee instead of not outputting anything for logging mode.
-rw-r--r--ChangeLog5
-rw-r--r--debian/changelog4
-rwxr-xr-xpbuilder-buildpackage2
-rwxr-xr-xpbuilder-checkparams2
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d0d0575..40ef087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-17 Junichi Uekawa <dancer@debian.org>
+
+ * pbuilder-checkparams:
+ * pbuilder-buildpackage: use tee so that user can see what's being logged.
+
2007-05-14 Junichi Uekawa <dancer@debian.org>
* Documentation/pbuilder-doc.ja.po:
diff --git a/debian/changelog b/debian/changelog
index 698fc94..6196310 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,13 +7,15 @@ pbuilder (0.167) UNRELEASED; urgency=low
add more pbuilder-test documentation.
* shut up lintian about binnmuability. Use {source:Version} instead of
Source-Version, according to http://wiki.debian.org/binNMU
+ * Use 'tee' to show output even in logged mode.
[ Loic Minier ]
* Tune aptitude opts in pbuilder-satisfydepends-aptitude to handle complex
dependencies in experimental, to support unsigned APT repositories, and to
not install Recommends.
- -- Junichi Uekawa <dancer@debian.org> Mon, 14 May 2007 00:40:51 +0900
+ -- Junichi Uekawa <dancer@debian.org> Thu, 17 May 2007 20:39:04 +0900
+
pbuilder (0.166) unstable; urgency=low
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 08c4c66..0c9b8f1 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -70,7 +70,7 @@ fi
if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then
if [ "${PKGNAME_LOGFILE}" = "yes" ]; then
PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)"${PKGNAME_LOGFILE_EXTENTION}"
- exec > "${PBUILDER_BUILD_LOGFILE}"
+ exec > >(tee "${PBUILDER_BUILD_LOGFILE}")
exec 2>&1
PBUILDER_BUILD_LOGFILE=$(readlink -f "${PBUILDER_BUILD_LOGFILE}")
echo "I: Using pkgname logfile"
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index ee10e2d..89cda72 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -137,7 +137,7 @@ while [ -n "$1" ]; do
;;
--logfile)
echo " -> Logging to $2"
- exec > "$2";
+ exec > >(tee "$2");
exec 2>&1
PBUILDER_BUILD_LOGFILE=$(readlink -f "$2")
shift; shift;