diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-08-27 17:31:40 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-09-07 03:23:29 +0200 |
| commit | 8150e04f7c49e5b00793c05322730053b6e357c1 (patch) | |
| tree | c1b27d6908c0a9867b1bf6c3cf08a4914ca53a84 /urpm/cfg.pm | |
| parent | bc7e830670503a7b51e5a89aedbbcbb78e14abc8 (diff) | |
| download | urpmi-8150e04f7c49e5b00793c05322730053b6e357c1.tar urpmi-8150e04f7c49e5b00793c05322730053b6e357c1.tar.gz urpmi-8150e04f7c49e5b00793c05322730053b6e357c1.tar.bz2 urpmi-8150e04f7c49e5b00793c05322730053b6e357c1.tar.xz urpmi-8150e04f7c49e5b00793c05322730053b6e357c1.zip | |
rename 'no-suggests' option as 'no-recommends'
keep --no-suggests but with a warning
Diffstat (limited to 'urpm/cfg.pm')
| -rw-r--r-- | urpm/cfg.pm | 8 |
1 files changed, 6 insertions, 2 deletions
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 |