From 44081af78cb038f36cc340f3b197bc6588bc4cd7 Mon Sep 17 00:00:00 2001 From: dancer Date: Sun, 18 Nov 2001 21:32:46 +0000 Subject: fix pbuilder login noninteractiveness problem --- debian/changelog | 12 ++++++++++++ pbuilder | 4 ++++ pbuilder-checkparams | 14 +++++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index cfc41c6..0ed99fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +pbuilder (0.12) unstable; urgency=low + + * The last version had a typo... bug 120057 was the one to close, not + 12057 :P + * A hook to check the current command-line operation, and + not to do the "exec < /dev/null" when it is trying to do + "login" is implemented, so that it is actually possible to + log in with noninteractive mode enabled. At the request of + steven.robbins@videotron.ca (closes: #120064) + + -- Junichi Uekawa Mon, 19 Nov 2001 06:28:05 +0900 + pbuilder (0.11) unstable; urgency=low * Fixing some minor glitch. pdebuild should be calling dpkg-buildpackage with -us -uc. diff --git a/pbuilder b/pbuilder index f459583..f0bf41a 100755 --- a/pbuilder +++ b/pbuilder @@ -10,6 +10,10 @@ test -z "$1" && ( showhelp ) +# export this so that programs know which command line +# operation is currently done +export PBCURRENTCOMMANDLINEOPERATION="$1" + case "$1" in create) shift; diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 01fb9b9..1ed43ba 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -95,7 +95,15 @@ if [ -z "$DEBEMAIL" ]; then DEBEMAIL="nobody@nowhere" fi +case "$PBCURRENTCOMMANDLINEOPERATION" in + login) + # don't do anything if it is "login" + ;; + *) # line from kobras@debian.org -if [ "$DEBIAN_FRONTEND" = "noninteractive" ]; then - exec < /dev/null -fi + if [ "$DEBIAN_FRONTEND" = "noninteractive" ]; then + exec < /dev/null + fi + ;; +esac + -- cgit v1.2.3