checkparam, reads ${home}/.pbuilderrc.

--logfile option is improved. (hopefully)

4 files changed, 23 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index e956a4f..20e44ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2002-01-28  Junichi Uekawa  <dancer@debian.org>
 
+	* debian/changelog: updated the changelog.
+
+	* pbuilder-checkparams: change the --logfile option behavior,
+	it should be able to redirect stderr output better.
+	Read ~/.pbuilderrc
+
+	* pbuilder.1: typo/spelling mistake fixed.
+
 	* debian/README.Debian (Notes): added notes on the workaround.
 
 2002-01-27  Junichi Uekawa  <dancer@debian.org>
diff --git a/debian/changelog b/debian/changelog
index 14b8011..f2e0c66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ pbuilder (0.19) unstable; urgency=low
   * Improved "pbuilder update/create/build" temp file cleaning process,
     so that in most cases it will be cleaned. (needs to be verified)
   * documented a workaround to some problems in README.Debian (needs to be verified)
+  * pbuilder.1 typo fixed.
+  * --logfile option should be better implemented, but still more work required?
+  * ~/.pbuilderrc is checked for user configs. (closes: #131181)
 
- -- Junichi Uekawa <dancer@debian.org>  Mon, 28 Jan 2002 02:55:18 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Mon, 28 Jan 2002 04:12:04 +0900
 
 pbuilder (0.18) unstable; urgency=low
 
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 5f5d13f..058b91a 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -1,7 +1,7 @@
 #! /bin/bash 
 # this is sourced from pbuilder packages to process the optional parameters.
 
-for RCFILE in /usr/share/pbuilder/pbuilderrc /etc/pbuilderrc; do
+for RCFILE in /usr/share/pbuilder/pbuilderrc /etc/pbuilderrc ${HOME}/.pbuilderrc; do
     if [ -f "$RCFILE" ]; then 
 	. "$RCFILE"
     else
@@ -82,7 +82,8 @@ while [ -n "$1" ]; do
 	    shift; shift;
 	    ;;
 	--logfile)
-	    exec 2>&1 > $(readlink -f "$2");
+	    exec > $(readlink -f "$2");
+	    exec 2>&1
 	    shift; shift;
 	    ;;
 	--help)
diff --git a/pbuilder.1 b/pbuilder.1
index 9f26c7e..383de28 100644
--- a/pbuilder.1
+++ b/pbuilder.1
@@ -73,7 +73,7 @@ updating and creation takes place. This is
 a temporary work directory.
 .TP
 .BI "--buildresult [" "location to put build result" "]"
-Specifiees the location the build result gets into after building.
+Specifies the location the build result gets into after building.
 The deb files and other files that have resulted from build 
 is copied there.
 .TP
@@ -204,7 +204,13 @@ standard output.
 .SH "FILES"
 .TP
 .I "/etc/pbuilderrc"
-The configuration file for pbuilder.
+The system-wide configuration file for pbuilder.
+.TP
+.I "/usr/share/pbuilder/pbuilderrc"
+The default settings for pbuilder, used as fallback.
+.TP
+.I "${HOME}/.pbuilderrc"
+The personal configuration file for pbuilder.
 .SH BUGS
 This program is starting to have too many options already.
 .SH AUTHOR