summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--urpm.pm2
-rw-r--r--urpm/install.pm2
3 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2a9792a1..6b51d5bc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
+Version 4.10.5 - 14 August 2007, by Pascal "Pixel" Rigaux
+
- urpmi
+ o keep_all_tags for now to avoid rpm saying file conflicts when the content
+ is the same
o restart after upgrading 'meta-task' because of /etc/urpmi/prefer.vendor.list
Version 4.10.4 - 13 August 2007, by Pascal "Pixel" Rigaux
diff --git a/urpm.pm b/urpm.pm
index f22d8553..53ce4b6e 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -12,7 +12,7 @@ use urpm::sys;
use urpm::cfg;
use urpm::md5sum;
-our $VERSION = '4.10.4';
+our $VERSION = '4.10.5';
our @ISA = qw(URPM Exporter);
our @EXPORT_OK = 'file_from_local_url';
diff --git a/urpm/install.pm b/urpm/install.pm
index d5e97707..7687eb71 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -155,7 +155,7 @@ sub install {
foreach my $mode ($install, $upgrade) {
foreach (keys %$mode) {
my $pkg = $urpm->{depslist}[$_];
- $pkg->update_header($mode->{$_});
+ $pkg->update_header($mode->{$_}, keep_all_tags => 1);
if ($pkg->payload_format eq 'drpm') { #- handle deltarpms
my $true_rpm = urpm::sys::apply_delta_rpm($mode->{$_}, "$urpm->{cachedir}/rpms", $pkg);
if ($true_rpm) {