dpkg-divert: Do not silently enable --rename on --remove

Closes: #160848

diff --git a/ChangeLog b/ChangeLog
index b4edc4a586bbebf909043024d6fb7a9dca601136..9534a5ae8717ab038be76952d4de7fc264eff245 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-17  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-divert.pl: Do not silently force --rename on --remove.
+
 2008-06-17  Juergen Kreileder <jk@blackdown.de>,
             Guillem Jover  <guillem@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index d071ec6f2cf08228979fa1f38aac39713529f7ab..52d98e370983753a4e00d5e991fc06dcbe58eba2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low
     Closes: #485365
   * Support diverting files when origin and destination are on different file
     systems. Based on a patch by Juergen Kreileder. Closes: #102144, #149961
+  * Do not silently enable --rename on dpkg-divert --remove. Closes: #160848
 
   [ Raphael Hertzog ]
   * Enhance dpkg-shlibdeps's error message when a library can't be found to

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index d6500d80ae0a1e7783bf42aa1241d9108b263936..ffc22bc02066ae21052de874b890ad85a99feef0 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -179,7 +179,6 @@ if ($mode eq 'add') {
                    ($i < $#altname ? @altname[$i+1..$#altname] : ()));
         @package= (($i > 0 ? @package[0..$i-1] : ()),
                    ($i < $#package ? @package[$i+1..$#package] : ()));
-       $dorename = 1;
         &checkrename($orgdivertto,$orgfile);
         &dorename($orgdivertto,$orgfile);
         &save;