Bug#314160: patch

[Joey Hess]

Here's a patch to put back the stderr logging for d-i.

-- 
see shy jo

diff -ur old/debootstrap-0.3.1.4/debian/changelog 
debootstrap-0.3.1.5/debian/changelog
--- old/debootstrap-0.3.1.4/debian/changelog    2005-06-26 23:38:45.000000000 
-0400
+++ debootstrap-0.3.1.5/debian/changelog        2005-07-20 13:58:24.000000000 
-0400
@@ -1,3 +1,9 @@
+debootstrap (0.3.1.5) UNRELEASED; urgency=low
+
+  * Restore logging to stderr in debian-installer mode. Closes: #314160
+
+ -- Joey Hess <[EMAIL PROTECTED]>  Wed, 20 Jul 2005 13:57:33 -0400
+
 debootstrap (0.3.1.4) unstable; urgency=low
 
   * NMU.
diff -ur old/debootstrap-0.3.1.4/debootstrap debootstrap-0.3.1.5/debootstrap
--- old/debootstrap-0.3.1.4/debootstrap 2005-06-16 05:21:27.000000000 -0400
+++ debootstrap-0.3.1.5/debootstrap     2005-07-20 13:57:12.000000000 -0400
@@ -106,6 +106,7 @@
           error 1 ARG_DIBYHAND "If running debootstrap by hand, don't use 
--debian-installer"
         fi
         USE_DEBIANINSTALLER_INTERACTION=yes
+       LOG_STDERR=true
         shift
         ;;
       --foreign)
@@ -295,7 +296,11 @@
 if am_doing_phase finddebs; then
   if [ "$FINDDEBS_NEEDS_INDICES" = "true" -o "$RESOLVE_DEPS" = "true" ]; then
     mkdir -p "$TARGET/debootstrap"
-    download_indices >>$TARGET/debootstrap/debootstrap.log 2>&1
+    if [ "$LOG_STDERR" != true ]; then
+      download_indices >>$TARGET/debootstrap/debootstrap.log 2>&1
+    else
+      download_indices >&2
+    fi
     GOT_INDICES=true
   fi
 
@@ -346,16 +351,28 @@
 
 if am_doing_phase dldebs; then
   if [ "$GOT_INDICES" != "true" ]; then
-    download_indices >>$TARGET/debootstrap/debootstrap.log 2>&1
+    if [ "$LOG_STDERR" != true ]; then
+      download_indices >>$TARGET/debootstrap/debootstrap.log 2>&1
+    else
+      download_indices >&2
+    fi
+  fi
+  if [ "$LOG_STDERR" != true ]; then
+    download $all_debs >>$TARGET/debootstrap/debootstrap.log 2>&1
+  else
+    download $all_debs >&2
   fi
-  download $all_debs >>$TARGET/debootstrap/debootstrap.log 2>&1
 fi
 
 if am_doing_phase first_stage; then
   # first stage sets up the chroot -- no calls should be made to 
   # "chroot $TARGET" here; but they should be possible by the time it's
   # finished
-  first_stage_install >>$TARGET/debootstrap/debootstrap.log 2>&1
+  if [ "$LOG_STDERR" != true ]; then
+    first_stage_install >>$TARGET/debootstrap/debootstrap.log 2>&1
+  else
+    first_stage_install >&2
+  fi
 
   if ! am_doing_phase second_stage; then
     cp "$0"                        $TARGET/debootstrap/debootstrap
@@ -383,13 +400,19 @@
   # work from entirely within the chroot (in case we've booted into it,
   # possibly over NFS eg)
 
-  second_stage_install >>$TARGET/debootstrap/debootstrap.log 2>&1
+  if [ "$LOG_STDERR" != true ]; then
+    second_stage_install >>$TARGET/debootstrap/debootstrap.log 2>&1
+  else
+    second_stage_install >&2
+  fi
 
   if [ -e "$TARGET/etc/apt/sources.list" ]; then
     rm -f "$TARGET/etc/apt/sources.list"
   fi
 
-  cp $TARGET/debootstrap/debootstrap.log $TARGET/var/log/bootstrap.log
+  if [ "$LOG_STDERR" != true ]; then
+    cp $TARGET/debootstrap/debootstrap.log $TARGET/var/log/bootstrap.log
+  fi
   sync
 
   if [ "$KEEP_DEBOOTSTRAP_DIR" = true ]; then

signature.asc
Description: Digital signature