diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | pod/8/urpmi.addmedia.pod | 7 | ||||
| -rw-r--r-- | urpm/args.pm | 1 | ||||
| -rw-r--r-- | urpm/media.pm | 1 | ||||
| -rwxr-xr-x | urpmi.addmedia | 2 |
5 files changed, 13 insertions, 0 deletions
@@ -2,6 +2,8 @@ o do not wrongly tell we updated the unrequested package list when we didn't (eg: when not having the proper rights such as running urpmq as !root) o only write the unrequested package list file if the list actually changed +- urpmi.addmedia: + o add --(no-)verify-rpm options - urpmq: minor documentation fix (mga#7166) Version 7.4 - 24 August 2012 diff --git a/pod/8/urpmi.addmedia.pod b/pod/8/urpmi.addmedia.pod index d5d233e8..4ccaf64f 100644 --- a/pod/8/urpmi.addmedia.pod +++ b/pod/8/urpmi.addmedia.pod @@ -128,6 +128,13 @@ C<urpmi --update> when looking for updates. If used together with B<--distrib>, it will only add media flagged "update". +=item B<--verify-rpm> + +=item B<--no-verify-rpm> + +Activate or deactivate rpm signature checking of newly added media. +It's activated by default, and can be overriden in global configuration. + =item B<--xml-info> Use the specific policy for downloading xml info files. diff --git a/urpm/args.pm b/urpm/args.pm index ce0b9150..df4a7b3c 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -351,6 +351,7 @@ my %options_spec = ( virtual => \$options{virtual}, nopubkey => \$options{nopubkey}, raw => \$options{raw}, + 'verify-rpm!' => sub { ${options}{'verify-rpm'} = $_[1] }, }, 'urpmi.recover' => { diff --git a/urpm/media.pm b/urpm/media.pm index fc3d77c6..c8d3dcda 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -836,6 +836,7 @@ sub add_medium { my $medium = { name => $name, url => $url, modified => !$options{ignore}, + (defined $options{'verify-rpm'} ? ('verify-rpm' => $options{'verify-rpm'}) : ()), }; foreach (qw(downloader update ignore media_info_dir mirrorlist with-dir xml-info)) { $medium->{$_} = $options{$_} if exists $options{$_}; diff --git a/urpmi.addmedia b/urpmi.addmedia index 1982d62d..7179b8e6 100755 --- a/urpmi.addmedia +++ b/urpmi.addmedia @@ -151,6 +151,7 @@ if ($options{distrib}) { probe_with => $options{probe_with}, nolock => $options{nolock}, ask_media => $add_media_callback, + 'verify-rpm' => $options{'verify-rpm'}, 'xml-info' => $options{'xml-info'}, ) or $urpm->{fatal}(10, N("unable to add medium")); $ok = urpm::media::update_media($urpm, %options, @@ -172,6 +173,7 @@ if ($options{distrib}) { zeroconf => $options{zeroconf}, 'with-dir' => $with_dir, virtual => $options{virtual}, + 'verify-rpm' => $options{'verify-rpm'}, update => $options{update}, ignore => $options{raw}, nolock => $options{nolock}, |