Package: bash
Version: 3.1-4
Severity: normal
Tags: patch
X-Debian-Specific: yes

"upgrade" and "failed-upgrade" should do the same thing:

--- /var/lib/dpkg/info/bash.prerm       2006-03-22 19:23:27.000000000 -0500
+++ /tmp/bash.prerm     2006-06-18 14:34:55.000000000 -0400
@@ -1,8 +1,15 @@
 #! /bin/bash -e
 
-if [ $1 != "upgrade" ]; then
-    update-alternatives --remove builtins.7.gz \
-       /usr/share/man/man7/bash-builtins.7.gz
-fi
+case "$1" in
+remove|deconfigure)
+       update-alternatives --remove builtins.7.gz \
+         /usr/share/man/man7/bash-builtins.7.gz
+       ;;
 
+upgrade|failed-upgrade)
+       ;;
 
+*)
+       echo "$0: Undocumented call: \"[EMAIL PROTECTED]"" >&2
+       exit 1;
+esac

Don't bother removing /etc/bash_completion, it is an
automatically-handled dpkg conffile,  not a generated file, so it
should not be editted, and should not need to be manually removed (the
exception is if preinst wants to move/remove obsolete files).  In fact
this file should never exist during postrm purge, except perhaps if it
was previously not a conffile.

../status: /etc/bash_completion d5cdc65b06a5943fa2299cf8e707a191
bash.list:/etc/bash_completion
bash.conffiles:/etc/bash_completion

Don't remove-shell during upgrades.

--- /var/lib/dpkg/info/bash.postrm      2006-03-22 19:23:27.000000000 -0500
+++ /tmp/bash.postrm    2006-06-19 10:39:28.000000000 -0400
@@ -1,14 +1,30 @@
 #! /bin/sh -e
 
-if [ "$1" = "purge" ]; then
-  rm -f /etc/bash_completion
-  rmdir --ignore-fail-on-non-empty /etc/bash_completion.d
-fi
-
-if [ -x /usr/sbin/remove-shell ]; then
-    /usr/sbin/remove-shell /bin/bash
-    /usr/sbin/remove-shell /bin/rbash
-fi
+case "$1" in
+remove|disappear)
+       if [ -x /usr/sbin/remove-shell ]; then
+           /usr/sbin/remove-shell /bin/bash
+           /usr/sbin/remove-shell /bin/rbash
+       fi
+       ;;
+
+purge)
+       rmdir --ignore-fail-on-non-empty /etc/bash_completion.d
+       ;;
+
+upgrade|failed-upgrade)
+       :;
+       ;;
+
+abort-install|abort-upgrade)
+       # preinst doesn't have anything to undo
+       ;;
+
+*)
+       echo "$0: Undocumented call: \"[EMAIL PROTECTED]"" >&2
+       exit 1;
+esac
+
 
 # Automatically added by dh_installmenu
 if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi



--- -   2006-06-19 10:36:53.458746000 -0400
+++ /tmp/README.Debian  2006-06-19 10:36:25.000000000 -0400
@@ -131,7 +131,7 @@
 9. Why is bash configured with --disable-net-redirections?
 
     It can produce completely unexpected results. This kind of
-    feature should not be part of a shell but a special. tool. And
+    feature should not be part of a shell but a special tool. And
     that tool has existed for years already, it's called netcat.
 
 
--- /home/pryzbyj/dpkg/dir/bash-3.1/debian/bash.preinst.c       2006-06-19 
10:30:47.000000000 -0400
+++ /tmp/bash.preinst.c 2006-06-19 10:43:39.000000000 -0400
@@ -106,7 +106,7 @@
   "As bash for Debian is destined to provide a working /bin/sh (pointing to\n"
   "/bin/bash) your link will be overwritten by a default link.\n\n"
   "If you don't want further upgrades to overwrite your customization,\n"
-  "please read /usr/share/doc/bash/README.Debian for a more permanent 
solution.\n\n"
+  "please read /usr/share/doc/bash/README.Debian.gz for a more permanent 
solution.\n\n"
   "[Press RETURN to continue]";
 
 int main(void) {


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to