rename 'no-suggests' option as 'no-recommends'

keep --no-suggests but with a warning

10 files changed, 28 insertions, 19 deletions

diff --git a/NEWS b/NEWS
index f621e204..8c72a94b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 - rpm-4.12 support:
   o rename 'no_suggests' parameter as 'no_recommends'
+  o rename '--no-suggests' option as '--no-recommends'
 
 Version 7.32 - 5 September 2014
 
diff --git a/pod/5/urpmi.cfg.pod b/pod/5/urpmi.cfg.pod
index baf35fbc..be298f2b 100644
--- a/pod/5/urpmi.cfg.pod
+++ b/pod/5/urpmi.cfg.pod
@@ -58,9 +58,9 @@ all xml info files are downloaded when doing urpmi.addmedia and urpmi.update
 
 =back
 
-=item B<no-suggests>
+=item B<no-recommends>
 
-Same as specifying B<--no-suggests> for urpmi. Disabled by default.
+Same as specifying B<--no-recommends> for urpmi. Disabled by default.
 
 =item B<auto>
 
diff --git a/pod/8/urpmi.pod b/pod/8/urpmi.pod
index 5c18cb2f..c43868ec 100644
--- a/pod/8/urpmi.pod
+++ b/pod/8/urpmi.pod
@@ -198,7 +198,7 @@ Proposes a very verbose mode (similar to rpm -vv)
 
 Print warnings when packages cannot be ordered properly due to dependancy loops.
 
-=item B<--no-suggests>
+=item B<--no-recommends>
 
 With this option, urpmi will not install "suggested" packages. 
 By default, urpmi will install (newly) suggested packages.
@@ -206,7 +206,7 @@ By default, urpmi will install (newly) suggested packages.
 =item B<--allow-suggests>
 
 With this option, urpmi will install "suggested" packages. 
-This is useful if you have C<no-suggests> in urpmi.cfg.
+This is useful if you have C<no-recommends> in urpmi.cfg.
 
 =item B<--justdb>
 
diff --git a/pod/8/urpmq.pod b/pod/8/urpmq.pod
index 8355a539..6778b73a 100644
--- a/pod/8/urpmq.pod
+++ b/pod/8/urpmq.pod
@@ -94,7 +94,7 @@ List packages that are not available on any media. This can help to find
 packages that are still installed but that are now obsolete because they
 have been removed from the current version of Mageia Linux.
 
-=item B<--no-suggests>
+=item B<--no-recommends>
 
 With this option, urpmq will not require "suggested" packages. 
 By default, urpmq will require (newly) suggested packages.
@@ -102,7 +102,7 @@ By default, urpmq will require (newly) suggested packages.
 =item B<--allow-suggests>
 
 With this option, urpmi will install "suggested" packages. 
-This is useful if you have C<no-suggests> in urpmi.cfg.
+This is useful if you have C<no-recommends> in urpmi.cfg.
 
 =item B<--keep>
 
diff --git a/urpm/args.pm b/urpm/args.pm
index 1f43cb49..c6a05e52 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -120,8 +120,12 @@ my %options_spec = (
 	suggests => sub { 
 	    $urpm->{fatal}(1, "Use --allow-suggests instead of --suggests");
 	},
-	'allow-suggests' => sub { $urpm->{options}{'no-suggests'} = 0 },
-	'no-suggests' => sub { $urpm->{options}{'no-suggests'} = 1 },
+	'allow-suggests' => sub { $urpm->{options}{'no-recommends'} = 0 },
+	'no-recommends' => sub { $urpm->{options}{'no-recommends'} = 1 },
+	'no-suggests' => sub { # COMPAT
+	    warn "WARNING: --no-suggests is deprecated. Use --no-recommends instead\n";
+	    $urpm->{options}{'no-recommends'} = 1;
+	},
 	'allow-nodeps' => sub { $urpm->{options}{'allow-nodeps'} = 1 },
 	'allow-force' => sub { $urpm->{options}{'allow-force'} = 1 },
 	'downgrade' => sub { $urpm->{options}{downgrade} = 1 },
@@ -418,7 +422,7 @@ foreach my $k ("test!", "force", "root=s", "use-distrib=s", 'env=s',
 {
     $options_spec{urpme}{$k} = $options_spec{urpmi}{$k};
 }
-foreach my $k ("root=s", "nolock", "use-distrib=s", "skip=s", "prefer=s", "synthesis=s", 'no-suggests', 'allow-suggests', 'auto-orphans')
+foreach my $k ("root=s", "nolock", "use-distrib=s", "skip=s", "prefer=s", "synthesis=s", 'no-recommends', 'no-suggests', 'allow-suggests', 'auto-orphans')
 {
     $options_spec{urpmq}{$k} = $options_spec{urpmi}{$k};
 }
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index f5f292ba..f088ba04 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -96,7 +96,7 @@ sub expand_line {
     return $line;
 }
 
-my $no_para_option_regexp = 'update|ignore|synthesis|noreconfigure|no-suggests|no-media-info|static|virtual|disable-certificate-check';
+my $no_para_option_regexp = 'update|ignore|synthesis|noreconfigure|no-recommends|no-suggests|no-media-info|static|virtual|disable-certificate-check';
 
 sub load_config_raw {
     my ($file, $b_norewrite) = @_;
@@ -164,8 +164,12 @@ sub load_config_raw {
 	} elsif (/^(hdlist|synthesis)$/) {
 	    # ignored, kept for compatibility
 	} elsif (/^($no_para_option_regexp)$/) {
+	    my $opt = $1;
+	    if ($opt =~ s/no-suggests/no-recommends/) { # COMPAT
+	        warn "WARNING: --no-suggests is deprecated. Use --no-recommends instead\n" if s/no-suggests/no-recommends/; # COMPAT
+	    }
 	    #- positive flags
-	    $block->{$1} = 1;
+	    $block->{$opt} = 1;
 	} elsif (my ($no, $k, $v) =
           /^(no-)?(
 	    verify-rpm
diff --git a/urpmf b/urpmf
index 954f0f00..d0a320cf 100755
--- a/urpmf
+++ b/urpmf
@@ -72,7 +72,7 @@ sub usage() {
 ") . N("  --requires     - requires tags
 ") . N("  --size         - installed size
 ") . N("  --sourcerpm    - source rpm name
-") . N("  --suggests     - suggests tags
+") . N("  --recommends   - recommends tags
 ") . N("  --summary      - summary
 ") . N("  --url          - url
 ") . N("  --vendor       - vendor
diff --git a/urpmi b/urpmi
index c04a3661..203dce9b 100755
--- a/urpmi
+++ b/urpmi
@@ -77,7 +77,7 @@ sub usage () {
 ") . N("    --no-md5sum    - disable MD5SUM file checking.
 ") . N("    --force-key    - force update of gpg key.
 ") . N("  --auto-orphans - remove orphans without asking
-") . N("  --no-suggests  - do not auto select \"suggested\" packages.
+") . N("  --no-recommends - do not auto select \"recommended\" packages.
 ") . N("  --no-uninstall - never ask to uninstall a package, abort the installation.
 ") . N("  --no-install   - don't install packages (only download)
 ") . N("  --keep         - keep existing packages if possible, reject requested
@@ -468,7 +468,7 @@ if ($options{replacepkgs}) {
     install_src => $install_src,
     keep => $urpm->{options}{keep},
     nodeps => $urpm->{options}{'allow-nodeps'} || $urpm->{options}{'allow-force'},
-    no_recommends => $urpm->{options}{'no-suggests'},
+    no_recommends => $urpm->{options}{'no-recommends'},
     priority_upgrade => $test || $env ? '' : $urpm->{options}{'priority-upgrade'},
     );
 }
diff --git a/urpmi.bash-completion b/urpmi.bash-completion
index 495d9cd0..87545cb7 100644
--- a/urpmi.bash-completion
+++ b/urpmi.bash-completion
@@ -100,7 +100,7 @@ _urpmi()
 	if [[ ${COMP_WORDS[0]} != *rurpmi ]]; then
 	    options="$options --root --use-distrib --env --auto-orphans \
 		--replacepkgs --justdb --allow-nodeps --allow-force \
-		--no-suggests --force --noscripts --auto-update --keep \
+		--no-recommends --force --noscripts --auto-update --keep \
 		--nokeep --replacefiles --verify-rpm"
 	    for (( i=1; i < COMP_CWORD; i++ )); do
 		case ${COMP_WORDS[i]} in
@@ -166,7 +166,7 @@ _urpmq()
 	COMPREPLY=( $( compgen -W "$common_options -d -u -m -a -c -y -s -i -g \
 	    -p -r -f -l --update --media --excludemedia --sortmedia \
 	    --synthesis --auto-select --auto-orphans --not-available \
-	    --no-suggests --fuzzy \
+	    --no-recommends --fuzzy \
 	    --keep --nokeep --list --list-url --list-media --list-nodes \
 	    --list-aliases --src --sources --provides --requires --obsoletes \
 	    --suggests --summary --sourcerpm --force --parallel --wget --curl \
diff --git a/urpmq b/urpmq
index 82fd93e5..05a078f5 100755
--- a/urpmq
+++ b/urpmq
@@ -49,7 +49,7 @@ sub usage() {
 ") . N("  --auto-orphans - list orphans
 ") . N("  --not-available
                  - list installed packages not available on any media.
-") . N("  --no-suggests  - do not auto select \"suggested\" packages.
+") . N("  --no-recommends - do not auto select \"recommended\" packages.
 ") . N("  --fuzzy        - impose fuzzy search (same as -y).
 ") . N("  --keep         - keep existing packages if possible, reject requested
                    packages that lead to removals.
@@ -365,7 +365,7 @@ if ($options{list_aliases}) {
 				    keep => $options{keep},
 				    rpmdb => $options{env} && "$options{env}/rpmdb.cz",
 				    auto_select => $options{auto_select},
-				    no_recommends => $urpm->{options}{'no-suggests'},
+				    no_recommends => $urpm->{options}{'no-recommends'},
 				    callback_choices => $stop_on_choices);
 	$options{deps} or delete @{$state->{selected}}{grep { exists $state->{selected}{$_} &&
 								  ! defined $state->{selected}{$_} } keys %{$state->{selected}}};
@@ -373,7 +373,7 @@ if ($options{list_aliases}) {
 	#- only deps required.
 	my $empty_db = URPM->new; #- URPM has same methods as URPM::DB and empty URPM will be seen as empty URPM::DB.
 	$urpm->resolve_requested($empty_db, $state, \%requested, 
-				 no_recommends => $urpm->{options}{'no-suggests'},
+				 no_recommends => $urpm->{options}{'no-recommends'},
 				 callback_choices => $stop_on_choices, nodeps => 1);
     } else {
 	$state->{selected} = \%requested;