4.0-7mdk

3 files changed, 19 insertions, 7 deletions

diff --git a/urpmi b/urpmi
index 04f43a36..3777011a 100755
--- a/urpmi
+++ b/urpmi
@@ -521,7 +521,8 @@ if (%sources_install || %sources) {
 		}
 	    } else {
 		my @l = $urpm->install([ keys %{$state->{ask_remove} || {}} ], \%sources_install, \%sources,
-				       translate_message => 1, test => $test);
+				       translate_message => 1,
+				       test => $test, oldpackage => $state->{oldpackage});
 		if (@l) {
 		    message(_("Installation failed") . ":\n" . join("\n",  map { "\t$_" } @l));
 
@@ -534,7 +535,8 @@ if (%sources_install || %sources) {
 		      or exit 1;
 		    $urpm->{log}("starting installing packages without deps");
 		    @l = $urpm->install([ keys %{$state->{ask_remove} || {}} ], \%sources_install, \%sources,
-					translate_message => 1, nodeps => 1);
+					translate_message => 1, nodeps => 1,
+					test => $test, oldpackage => $state->{oldpackage});
 		    if (@l) {
 			message(_("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l));
 			!$allow_force and exit 1;
@@ -542,7 +544,8 @@ if (%sources_install || %sources) {
 			  or exit 1;
 			$urpm->{log}("starting force installing packages without deps");
 			@l = $urpm->install([ keys %{$state->{ask_remove} || {}} ], \%sources_install, \%sources,
-					    translate_message => 1, nodeps => 1, force => 1);
+					    translate_message => 1, nodeps => 1, force => 1,
+					    test => $test, oldpackage => $state->{oldpackage});
 			@l and $urpm->fatal(2, _("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l));
 		    }
 		} else {
diff --git a/urpmi.spec b/urpmi.spec
index 1734e645..c2e32453 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,13 +2,13 @@
 
 Name: urpmi
 Version: 4.0
-Release: 6mdk
+Release: 7mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
 Summary: User mode rpm install
 Requires: eject webfetch perl-DateManip >= 5.40
-PreReq: perl-Locale-gettext rpmtools >= 4.3-6mdk perl-URPM >= 0.70-1mdk
+PreReq: perl-Locale-gettext rpmtools >= 4.3-6mdk perl-URPM >= 0.70-3mdk
 BuildRequires: bzip2-devel gettext rpm-devel >= 4.0.3
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildArch: noarch
@@ -177,6 +177,10 @@ fi
 
 
 %changelog
+* Wed Aug 28 2002 François Pons <fpons@mandrakesoft.com> 4.0-7mdk
+- added --list-media to urpmq.
+- fixed old package not upgraded.
+
 * Tue Aug 27 2002 François Pons <fpons@mandrakesoft.com> 4.0-6mdk
 - fixed skip.list new format.
 
diff --git a/urpmq b/urpmq
index 386b3642..8f18b993 100755
--- a/urpmq
+++ b/urpmq
@@ -54,6 +54,7 @@ usage:
 ") . _("  --auto-select  - automatically select packages to upgrade the system.
 ") . _("  --fuzzy        - impose fuzzy search (same as -y).
 ") . _("  --list         - list available packages.
+") . _("  --list-media   - list available media.
 ") . _("  --src          - next package is a source package (same as -s).
 ") . _("  --headers      - extract headers for package listed from urpmi db to
                    stdout (root only).
@@ -84,6 +85,7 @@ for (@ARGV) {
     /^--auto-select$/ and do { $query->{deps} = $query->{upgrade} = $query->{auto_select} = 1; next };
     /^--fuzzy$/ and do { $query->{fuzzy} = 1; next };
     /^--list$/ and do { $query->{list} = 1; next };
+    /^--list-media$/ and do { $query->{list_media} = 1; next };
     /^--src$/ and do { $query->{src} = 1; next };
     /^--headers$/ and do { $query->{headers} = 1; next };
     /^--sources$/ and do { $query->{sources} = 1; next };
@@ -146,8 +148,11 @@ $urpm->configure(nocheck_access => 1,
 my $state = {};
 my %requested;
 
-#- if list has been activated, select all...
-if ($query->{list}) {
+if ($query->{list_media}) {
+    print join "\n", map { $_->{name} } @{$urpm->{media}};
+    exit 0;
+} elsif ($query->{list}) {
+    #- if list has been activated, select all...
     @{$state->{selected}}{0 .. $#{$urpm->{depslist}}} = ();
 } else {
     %requested = $urpm->register_rpms(@files);