[SCM] dpkg's main repository branch, master, updated. 1.14.20-53-g4bb0b4b

[Guillem Jover]

The following commit has been merged in the master branch:
commit 4bb0b4bfda2bd82cb78a3261ecaa22cc36e44f0a
Author: Guillem Jover <[EMAIL PROTECTED]>
Date:   Tue Jun 17 08:14:29 2008 +0300

    dpkg-divert: Do not silently enable --rename on --remove
    
    Closes: #160848

diff --git a/ChangeLog b/ChangeLog
index b4edc4a..9534a5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-17  Guillem Jover  <[EMAIL PROTECTED]>
+
+       * scripts/dpkg-divert.pl: Do not silently force --rename on --remove.
+
 2008-06-17  Juergen Kreileder <[EMAIL PROTECTED]>,
             Guillem Jover  <[EMAIL PROTECTED]>
 
diff --git a/debian/changelog b/debian/changelog
index d071ec6..52d98e3 100644
--- 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 d6500d8..ffc22bc 100755
--- 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;

-- 
dpkg's main repository


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