summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-27 16:23:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-27 16:23:56 +0000
commit9da4da7138e8ea27730db275f8b18ac084252115 (patch)
treef9e5a1f5483183c542608ca7f2a173d01e644aa5
parent7e54d47105159894a617398dd2ca4faa782fe587 (diff)
downloadurpmi-9da4da7138e8ea27730db275f8b18ac084252115.tar
urpmi-9da4da7138e8ea27730db275f8b18ac084252115.tar.gz
urpmi-9da4da7138e8ea27730db275f8b18ac084252115.tar.bz2
urpmi-9da4da7138e8ea27730db275f8b18ac084252115.tar.xz
urpmi-9da4da7138e8ea27730db275f8b18ac084252115.zip
with perl-URPM 2.04, promote on obsoletes are properly handled
-rw-r--r--t/superuser--split-transactions--strict-require-and-obsolete.t4
-rw-r--r--urpm.pm1
2 files changed, 3 insertions, 2 deletions
diff --git a/t/superuser--split-transactions--strict-require-and-obsolete.t b/t/superuser--split-transactions--strict-require-and-obsolete.t
index c2e2fcd9..0f8df7b5 100644
--- a/t/superuser--split-transactions--strict-require-and-obsolete.t
+++ b/t/superuser--split-transactions--strict-require-and-obsolete.t
@@ -41,7 +41,7 @@ sub test_c {
urpmi("--media $name-1 --auto a");
check_installed_fullnames('a-1-1', 'bb-1-1', 'c-1-1');
- #- WARNING: below would need the promotion of "b" (obsoleting bb) to work
+ #- below need the promotion of "b" (obsoleting bb) to work
urpmi("--media $name-2 $option --auto c");
- check_installed_fullnames_and_remove('c-2-1'); # a and bb are removed
+ check_installed_fullnames_and_remove('a-1-1', 'b-2-1', 'c-2-1');
}
diff --git a/urpm.pm b/urpm.pm
index 8e48b543..b1ebfb76 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -32,6 +32,7 @@ sub new {
# from URPM
depslist => [],
provides => {},
+ obsoletes => {},
media => undef,
options => {},