Ubuntu dpkg 1.13.24ubuntu5

[Ubuntu Merge-o-Matic <mom@ubuntu.com>]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.

Format: 1.7
Date: Mon, 19 Feb 2007 17:26:05 +0000
Source: dpkg
Binary: dpkg dselect dpkg-dev
Architecture: source
Version: 1.13.24ubuntu5
Distribution: feisty
Urgency: low
Maintainer: ubuntu-devel@lists.ubuntu.com
Changed-By: Ian Jackson <iwj@ubuntu.com>
Description: 
 dpkg       - package maintenance system for Debian
 dpkg-dev   - package building tools for Debian
 dselect    - user tool to manage Debian packages
Changes: 
 dpkg (1.13.24ubuntu5) feisty; urgency=low
 .
   * scripts/update-alternatives.pl: in the case where the slave is
     inapplicable do not attempt to create the slave link before removing
     it again.  This will help alleviate LP #84906 (vim upgrade problems)
     and will generally make things slightly less fragile.
Files: 
 e3f10a2d9dac115bbccb27c9a6e8659b 918 admin required dpkg_1.13.24ubuntu5.dsc
 49d36274473673b03114060d7abd4c40 4901848 admin required dpkg_1.13.24ubuntu5.tar.gz
Original-Maintainer: Dpkg Developers <team@dpkg.org>

diff -pruN 1.13.24ubuntu4/debian/changelog 1.13.24ubuntu5/debian/changelog
--- 1.13.24ubuntu4/debian/changelog	2007-02-13 11:36:08.000000000 +0000
+++ 1.13.24ubuntu5/debian/changelog	2007-02-20 12:31:02.000000000 +0000
@@ -1,3 +1,12 @@
+dpkg (1.13.24ubuntu5) feisty; urgency=low
+
+  * scripts/update-alternatives.pl: in the case where the slave is
+    inapplicable do not attempt to create the slave link before removing
+    it again.  This will help alleviate LP #84906 (vim upgrade problems)
+    and will generally make things slightly less fragile.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Mon, 19 Feb 2007 17:26:05 +0000
+
 dpkg (1.13.24ubuntu4) feisty; urgency=low
 
   [ Martin Pitt ]
diff -pruN 1.13.24ubuntu4/scripts/update-alternatives.pl 1.13.24ubuntu5/scripts/update-alternatives.pl
--- 1.13.24ubuntu4/scripts/update-alternatives.pl	2006-06-21 03:36:39.000000000 +0100
+++ 1.13.24ubuntu5/scripts/update-alternatives.pl	2007-02-19 16:55:23.000000000 +0000
@@ -519,18 +519,6 @@ if ($manual eq 'auto') {
     for ($j=0; $j<=$#slavenames; $j++) {
         $sname= $slavenames[$j];
         $slink= $slavelinks[$j];
-        if (!defined($linkname= readlink($slink)) && $! != &ENOENT) {
-            &pr(sprintf(_g("warning: %s is supposed to be a slave symlink to\n".
-                " %s, or nonexistent; however, readlink failed: %s"), $slink, "$altdir/$sname", $!))
-              if $verbosemode > 0;
-        } elsif ($linkname ne "$altdir/$sname") {
-            unlink("$slink.dpkg-tmp") || $! == &ENOENT ||
-                &quit(sprintf(_g("unable to ensure %s nonexistent: %s"), "$slink.dpkg-tmp", $!));
-            symlink("$altdir/$sname","$slink.dpkg-tmp") ||
-                &quit(sprintf(_g("unable to make %s a symlink to %s: %s"), "$slink.dpkg-tmp", "$altdir/$sname", $!));
-            rename_mv("$slink.dpkg-tmp",$slink) ||
-                &quit(sprintf(_g("unable to install %s as %s: %s"), "$slink.dpkg-tmp", $slink, $!));
-        }
         $spath= $slavepath{$bestnum,$j};
         unlink("$altdir/$sname.dpkg-tmp") || $! == &ENOENT ||
             &quit(sprintf(_g("unable to ensure %s nonexistent: %s"), "$altdir/$sname.dpkg-tmp", $!));
@@ -542,6 +530,18 @@ if ($manual eq 'auto') {
 	    unlink("$slink") || $! == &ENOENT ||
 	        &quit(sprintf(_g("unable to remove %s: %s"), $slink, $!));
         } else {
+	    if (!defined($linkname= readlink($slink)) && $! != &ENOENT) {
+		&pr(sprintf(_g("warning: %s is supposed to be a slave symlink to\n".
+			       " %s, or nonexistent; however, readlink failed: %s"), $slink, "$altdir/$sname", $!))
+		    if $verbosemode > 0;
+	    } elsif ($linkname ne "$altdir/$sname") {
+		unlink("$slink.dpkg-tmp") || $! == &ENOENT ||
+		    &quit(sprintf(_g("unable to ensure %s nonexistent: %s"), "$slink.dpkg-tmp", $!));
+		symlink("$altdir/$sname","$slink.dpkg-tmp") ||
+		    &quit(sprintf(_g("unable to make %s a symlink to %s: %s"), "$slink.dpkg-tmp", "$altdir/$sname", $!));
+		rename_mv("$slink.dpkg-tmp",$slink) ||
+		    &quit(sprintf(_g("unable to install %s as %s: %s"), "$slink.dpkg-tmp", $slink, $!));
+	    }
             if (defined($linkname= readlink("$altdir/$sname")) && $linkname eq $spath) {
                 &pr(sprintf(_g("Leaving %s (%s) pointing to %s."), $sname, $slink, $spath))
                   if $verbosemode > 0;