summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-09-25 16:15:49 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-09-25 16:15:49 +0000
commitab920d17f80c9ba9f48eb951057e262aa58d3dde (patch)
tree0b71d46e517e94fc8be0618c19fc32b36f8a9c90
parent2423ddc80cfb7c1c55e7041d3df3564f36450bf8 (diff)
downloadurpmi-ab920d17f80c9ba9f48eb951057e262aa58d3dde.tar
urpmi-ab920d17f80c9ba9f48eb951057e262aa58d3dde.tar.gz
urpmi-ab920d17f80c9ba9f48eb951057e262aa58d3dde.tar.bz2
urpmi-ab920d17f80c9ba9f48eb951057e262aa58d3dde.tar.xz
urpmi-ab920d17f80c9ba9f48eb951057e262aa58d3dde.zip
add per-media disable-certificate-check option
-rw-r--r--urpm/cfg.pm2
-rw-r--r--urpm/media.pm1
2 files changed, 2 insertions, 1 deletions
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index 149d41fc..8711f9e1 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -103,7 +103,7 @@ sub expand_line {
return $line;
}
-my $no_para_option_regexp = 'update|ignore|synthesis|noreconfigure|no-suggests|no-media-info|static|virtual';
+my $no_para_option_regexp = 'update|ignore|synthesis|noreconfigure|no-suggests|no-media-info|static|virtual|disable-certificate-check';
sub load_config_raw {
my ($file, $b_norewrite) = @_;
diff --git a/urpm/media.pm b/urpm/media.pm
index ce93bb4d..b77ac2c5 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -12,6 +12,7 @@ use MDV::Distribconf;
our @PER_MEDIA_OPT = qw(
+ disable-certificate-check
downloader
ignore
key-ids