*** empty log message ***

3 files changed, 16 insertions, 5 deletions

diff --git a/urpmi b/urpmi
index aff37c26..3cf2a5e4 100755
--- a/urpmi
+++ b/urpmi
@@ -35,7 +35,7 @@ my $force = 0;
 my $X = 0;
 my $all = 0;
 my $complete = 0;
-my $minimal = 0;
+my $minimal = 1;
 my $rpm_opt = "-Uvh";
 my $verbose = 0;
 
@@ -53,7 +53,7 @@ delete @ENV{qw(ENV BASH_ENV IFS CDPATH)};
 sub usage {
     #die(_("usage: urpmi [-h] [--auto] [--force] [-a] [-v] package_name|rpm_file [package_names|rpm_files...]\n"));
     die( sprintf (_("urpmi version %s
-Copyright (C) 1999, 2000 MandrakeSoft.
+Copyright (C) 1999, 2000, 2001 MandrakeSoft.
 This is free software and may be redistributed under the terms of the GNU GPL.
 
 usage:
@@ -65,6 +65,8 @@ usage:
   --best-output    - choose best interface according to the environment:
                      X or text mode.
   -a               - select all matches on command line.
+  -m               - choose minimum closure of requires (default).
+  -M               - choose maximun closure of requires.
   -c               - choose complete method for resolving requires closure.
   -q               - quiet mode.
   -v               - verbose mode.
@@ -88,6 +90,7 @@ for (@ARGV) {
 	/a/ and do { $all = 1; next };
 	/c/ and do { $complete = 1; next };
 	/m/ and do { $minimal = 1; next };
+	/M/ and do { $minimal = 0; next };
 	/q/ and do { $rpm_opt = "-U"; next };
 	/v/ and do { $verbose = 1; next };
 	die "urpmi: unknown option \"-$1\", check usage with --help\n"; } next };
diff --git a/urpmi.spec b/urpmi.spec
index 8eb0e62c..e0e7de17 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 1.5
-Release: 14mdk
+Release: 15mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Summary: User mode rpm install
@@ -113,6 +113,9 @@ autoirpm.uninstall
 
 
 %changelog
+* Sat Mar  3 2001 François Pons <fpons@mandrakesoft.com> 1.5-15mdk
+- urpmi mode set to -m by default.
+
 * Thu Mar  1 2001 François Pons <fpons@mandrakesoft.com> 1.5-14mdk
 - update with newer rpmtools interface.
 
diff --git a/urpmq b/urpmq
index 8718bd8d..74fd674e 100755
--- a/urpmq
+++ b/urpmq
@@ -31,7 +31,9 @@ import Locale::GetText I_;
 *_ = *I_;
 
 #- default options.
-my $query = {};
+my $query = {
+	     minimal => 1,
+	    };
 
 my @files;
 my @names;
@@ -42,7 +44,7 @@ my @names;
 sub usage {
     #die(_("usage: urpmq [-h] [-d] [-u] [-c] [-g] [-v] [-r] package_name|rpm_file [package_names|rpm_files...]\n"));
     die( sprintf(_("urpmq version %s
-Copyright (C) 2000 MandrakeSoft.
+Copyright (C) 2000, 2001 MandrakeSoft.
 This is free software and may be redistributed under the terms of the GNU GPL.
 
 usage:
@@ -53,6 +55,8 @@ usage:
   -m             - extend query to package dependancies, remove already
                    installed package that provide what is necessary, add
                    packages that may be block the upgrade.
+  -M             - extend query to package dependancies and remove already
+                   installed package only if they are newer or the same.
   -c             - choose complete method for resolving requires closure.
   -g             - print groups too with name.
   -r             - print version and release too with name.
@@ -80,6 +84,7 @@ for (@ARGV) {
 	/d/ and do { $query->{deps} = 1; next };
 	/u/ and do { $query->{upgrade} = 1; next };
 	/m/ and do { $query->{minimal} = 1; next };
+	/M/ and do { $query->{minimal} = 0; next };
 	/c/ and do { $query->{complete} = 1; next };
 	/g/ and do { $query->{group} = 1; next };
 	/v/ and do { $query->{verbose} = 1; next };