Add a new configuration option, default-media, that specifies a comma-separated

list of media to be taken into account by default (i.e., if the --media switch
is not specified on the command-line)

2 files changed, 7 insertions, 2 deletions

diff --git a/urpm.pm b/urpm.pm
index 34198243..9006bdb8 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -157,6 +157,7 @@ sub read_config {
 	    auto
 	    compress
 	    downloader
+	    default-media
 	    excludedocs
 	    excludepath
 	    fuzzy
@@ -507,10 +508,13 @@ sub configure {
             $urpm->add_distrib_media("Virtual", $options{usedistrib}, %options, 'virtual' => 1);
         } else {
 	    $urpm->read_config(%options);
+	    if (!$options{media} && $urpm->{options}{'default-media'}) {
+		$options{media} = $urpm->{options}{'default-media'};
+	    }
         }
 	if ($options{media}) {
 	    delete $_->{modified} foreach @{$urpm->{media} || []};
-	    $urpm->select_media(split ',', $options{media});
+	    $urpm->select_media(split /,/, $options{media});
 	    foreach (grep { !$_->{modified} } @{$urpm->{media} || []}) {
 		#- this is only a local ignore that will not be saved.
 		$_->{ignore} = 1;
@@ -527,7 +531,7 @@ sub configure {
 	}
 	if ($options{excludemedia}) {
 	    delete $_->{modified} foreach @{$urpm->{media} || []};
-	    $urpm->select_media(split ',', $options{excludemedia});
+	    $urpm->select_media(split /,/, $options{excludemedia});
 	    foreach (grep { $_->{modified} } @{$urpm->{media} || []}) {
 		#- this is only a local ignore that will not be saved.
 		$_->{ignore} = 1;
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index 6e5f2809..581c4fa8 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -152,6 +152,7 @@ sub load_config ($;$) {
 	  |prohibit-remove
 	  |downloader
 	  |retry
+	  |default-media
 	  |(?:curl|rsync|wget)-options
 	 )\s*:\s*['"]?(.*?)['"]?$/x
 	    and $config{$medium}{$1} = $2, next;