From 4bb0b4bfda2bd82cb78a3261ecaa22cc36e44f0a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 17 Jun 2008 08:14:29 +0300 Subject: [PATCH] dpkg-divert: Do not silently enable --rename on --remove Closes: #160848 --- ChangeLog | 4 ++++ debian/changelog | 1 + scripts/dpkg-divert.pl | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b4edc4a5..9534a5ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-06-17 Guillem Jover + + * scripts/dpkg-divert.pl: Do not silently force --rename on --remove. + 2008-06-17 Juergen Kreileder , Guillem Jover diff --git a/debian/changelog b/debian/changelog index d071ec6f..52d98e37 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 d6500d80..ffc22bc0 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; -- 2.39.5