summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-17 07:46:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-17 07:46:13 +0000
commitb6b22789d8ad280edc50550c622dea0c2269aa50 (patch)
treebd92367ed0bb2e43bb179211ac7aec11f8cb484c
parentb17ef52f5d20217f56597dfe83438dd2fe6925dc (diff)
downloadurpmi-b6b22789d8ad280edc50550c622dea0c2269aa50.tar
urpmi-b6b22789d8ad280edc50550c622dea0c2269aa50.tar.gz
urpmi-b6b22789d8ad280edc50550c622dea0c2269aa50.tar.bz2
urpmi-b6b22789d8ad280edc50550c622dea0c2269aa50.tar.xz
urpmi-b6b22789d8ad280edc50550c622dea0c2269aa50.zip
- urpme, library
o do not display things like "conflicts@b-1-1.noarch@a-1-1.noarch@/etc/foo" (regression introduced in 6.14.5)
-rw-r--r--NEWS4
-rw-r--r--urpm/install.pm1
-rw-r--r--urpm/main_loop.pm1
3 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 71571e9f..8badcbba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- urpme, library
+ o do not display things like "conflicts@b-1-1.noarch@a-1-1.noarch@/etc/foo"
+ (regression introduced in 6.14.5)
+
Version 6.14.8 - 16 October 2008
- gurpmi
diff --git a/urpm/install.pm b/urpm/install.pm
index 563f3733..020fa1ad 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -161,7 +161,6 @@ sub options {
sub install {
my ($urpm, $remove, $install, $upgrade, %options) = @_;
$options{translate_message} = 1;
- $options{raw_message} = 1;
my $db = urpm::db_open_or_die_($urpm, !$options{test}); #- open in read/write mode unless testing installation.
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 5f87caa7..2e0fb70f 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -212,6 +212,7 @@ foreach my $set (@{$state->{transaction} || []}) {
callback_inst => $callbacks->{inst},
callback_trans => $callbacks->{trans},
callback_report_uninst => $callbacks->{callback_report_uninst},
+ raw_message => 1,
);
urpm::orphans::add_unrequested($urpm, $state);