diff options
author | Francois Pons <fpons@mandriva.com> | 2001-11-28 10:16:10 +0000 |
---|---|---|
committer | Francois Pons <fpons@mandriva.com> | 2001-11-28 10:16:10 +0000 |
commit | c24edadb524096a9fd8dc36697a0d9b4795d4ad6 (patch) | |
tree | 5101484f89afd5f5c741d058fc47068539260540 /urpmq | |
parent | 8923ae296271934e0e9f486877efde3f6e090d24 (diff) | |
download | urpmi-c24edadb524096a9fd8dc36697a0d9b4795d4ad6.tar urpmi-c24edadb524096a9fd8dc36697a0d9b4795d4ad6.tar.gz urpmi-c24edadb524096a9fd8dc36697a0d9b4795d4ad6.tar.bz2 urpmi-c24edadb524096a9fd8dc36697a0d9b4795d4ad6.tar.xz urpmi-c24edadb524096a9fd8dc36697a0d9b4795d4ad6.zip |
small fixes and typo fixes back.
Diffstat (limited to 'urpmq')
-rwxr-xr-x | urpmq | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -50,8 +50,7 @@ usage: ") . _(" --headers - extract headers for package listed from urpmi db to stdout (root only). ") . _(" --sources - give all source packages before downloading (root only). -") . _(" --force - force invocation even if some packages do not -exist. +") . _(" --force - force invocation even if some packages do not exist. ") . "\n" . _(" names or rpm files given on command line are queried. ", $urpm::VERSION); exit(0); @@ -70,8 +69,8 @@ for (@ARGV) { /[\?h]/ and do { usage; next }; /d/ and do { $query->{deps} = 1; next }; /u/ and do { $query->{upgrade} = 1; next }; - /m/ and do { next }; - /M/ and do { next }; + /m/ and do { $query->{deps} = $query->{upgrade} = 1; next }; + /M/ and do { $query->{deps} = $query->{upgrade} = 1; next }; /c/ and do { $query->{complete} = 1; next }; /g/ and do { $query->{group} = 1; next }; /p/ and do { $query->{use_provides} = 1; next }; @@ -116,7 +115,9 @@ $urpm->relocate_depslist_provides(use_active => $query->{update}); #- basesystem is added to the list so if it need to be upgraded, all its dependency #- will be updated too. my %packages; -$urpm->search_packages(\%packages, [ @names ], use_provides => $query->{use_provides}, use_active => $query->{update}) +$urpm->search_packages(\%packages, [ @names ], + use_provides => $query->{use_provides}, + use_active => $query->{update}) or $query->{force} or exit 1; #- auto select package for upgrading the distribution. @@ -134,8 +135,8 @@ if ($query->{auto_select}) { #- filter to add in packages selected required packages. $query->{use_provides} || @files or $urpm->read_provides; $query->{update} || $query->{auto_select} or $urpm->read_config(nocheck_access => 1); -$urpm->filter_minimal_packages_to_upgrade(\%packages, undef, - keep_alldeps => $query->{deps} && !$query->{upgrade}); +$query->{deps} and $urpm->filter_minimal_packages_to_upgrade(\%packages, undef, + keep_alldeps => !$query->{upgrade}); #- get out of package that should not be upgraded. $urpm->deselect_unwanted_packages(\%packages); |