From 0bab0389bbf9ff17117c1bee27feaa8bc45e25c7 Mon Sep 17 00:00:00 2001
From: Junichi Uekawa <dancer@dancer64.netfort.gr.jp>
Date: Thu, 17 May 2007 21:44:33 +0900
Subject: change --logfile option to "tee" and document that change

---
 ChangeLog                  | 7 +++++++
 pbuilder-user-mode-linux.1 | 2 +-
 pbuilder.8                 | 5 ++---
 pdebuild-checkparams       | 2 +-
 pdebuild-uml-checkparams   | 2 +-
 pdebuild.1                 | 3 +--
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40ef087..9aeed9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-05-17  Junichi Uekawa  <dancer@debian.org>
 
+	* pdebuild.1: 
+	* pbuilder.8: 
+	* pbuilder-user-mode-linux.1: update documentation.
+
+	* pdebuild-uml-checkparams: use tee for --logfile
+
+	* pdebuild-checkparams: 
 	* pbuilder-checkparams: 
 	* pbuilder-buildpackage: use tee so that user can see what's being logged.
 
diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1
index 0908e2c..ede5de9 100644
--- a/pbuilder-user-mode-linux.1
+++ b/pbuilder-user-mode-linux.1
@@ -151,7 +151,7 @@ to switch distribution using
 .BI "\-\-logfile " "logfilename"
 Specify this option to make the output go to 
 .I logfilename
-instead of standard output.
+as well as standard output.
 
 .TP 
 .BI "\-\-buildresult " "/dir/to/build/result"
diff --git a/pbuilder.8 b/pbuilder.8
index bfc9d44..6bd3d82 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -357,9 +357,8 @@ Multiple options are delimited with spaces.
 .TP
 .BI "\-\-logfile [" "file to log" "]"
 Specifies the logfile to create. 
-The messages generated during execution will be written to the file, 
-instead of messages coming to the 
-standard output.
+The messages generated during execution will be written to the specified file, 
+and the standard output.
 
 .TP
 .BI "\-\-pkgname\-logfile"
diff --git a/pdebuild-checkparams b/pdebuild-checkparams
index 345f146..e03808f 100644
--- a/pdebuild-checkparams
+++ b/pdebuild-checkparams
@@ -84,7 +84,7 @@ while [ -n "$1" ]; do
 	    ;;
 	--logfile)
 	    echo "  -> Logging to $2"
-	    exec > "$2";
+	    exec > >(tee "$2");
 	    exec 2>&1
 	    shift; shift;
 	    ;;
diff --git a/pdebuild-uml-checkparams b/pdebuild-uml-checkparams
index ac90607..39727a0 100644
--- a/pdebuild-uml-checkparams
+++ b/pdebuild-uml-checkparams
@@ -35,7 +35,7 @@ UML_LOGIN_NOCOW=
 while [ -n "$1" ] ; do
     case "$1" in
 	--logfile)
-	    exec > "$2";
+	    exec > >(tee "$2");
 	    exec 2>&1
 	    shift;shift;;
 	--auto-debsign)
diff --git a/pdebuild.1 b/pdebuild.1
index 79001ac..ef45bb5 100644
--- a/pdebuild.1
+++ b/pdebuild.1
@@ -95,8 +95,7 @@ from the build scripts.
 .BI "\-\-logfile [" "file to log" "]"
 Specifies the logfile to create. 
 The messages generated during execution will be written to the file, 
-instead of messages coming to the 
-standard output.
+as well as standard output.
 
 .TP
 .BI "\-\-pbuilder [" "pbuilder" "]"
-- 
cgit v1.2.3