diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2007-06-18 14:46:44 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2007-06-18 14:46:44 +0000 |
commit | af36e44a71db07c5bebbce7884ddba004879615d (patch) | |
tree | 599de244adb78e4881f412be06aebb9ce8766117 | |
parent | 26624558d089978e45ead4a25490b757bfe9a2ab (diff) | |
download | urpmi-af36e44a71db07c5bebbce7884ddba004879615d.tar urpmi-af36e44a71db07c5bebbce7884ddba004879615d.tar.gz urpmi-af36e44a71db07c5bebbce7884ddba004879615d.tar.bz2 urpmi-af36e44a71db07c5bebbce7884ddba004879615d.tar.xz urpmi-af36e44a71db07c5bebbce7884ddba004879615d.zip |
- urpmi.addmedia
o fix reconfig.urpmi use
(backport from trunk)
without this, one gets:
foo urlxxx {
}
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | urpm/media.pm | 9 |
2 files changed, 6 insertions, 5 deletions
@@ -1,5 +1,7 @@ - urpmi o [bugfix] fix plural handling in "Packages foo can not be installed" (#31229) +- urpmi.addmedia + o [bugfix] fix reconfig.urpmi use - urpmf o bug fix -m (#31452) diff --git a/urpm/media.pm b/urpm/media.pm index 7c96faa5..dd73085e 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -919,7 +919,7 @@ sub may_reconfig_urpmi { urpm::download::sync($urpm, $medium, [ reduce_pathname("$medium->{url}/reconfig.urpmi") ], quiet => 1); } if (-s $f) { - reconfig_urpmi($urpm, $f, $medium->{name}); + reconfig_urpmi($urpm, $f, $medium); } unlink $f if !file_from_local_url($medium->{url}); } @@ -935,10 +935,10 @@ sub may_reconfig_urpmi { #- # this is an urpmi reconfiguration file #- /cooker /cooker/$ARCH sub reconfig_urpmi { - my ($urpm, $rfile, $name) = @_; + my ($urpm, $rfile, $medium) = @_; -r $rfile or return; - $urpm->{log}(N("reconfiguring urpmi for media \"%s\"", $name)); + $urpm->{log}(N("reconfiguring urpmi for media \"%s\"", $medium->{name})); my ($magic, @lines) = cat_($rfile); #- the first line of reconfig.urpmi must be magic, to be sure it's not an error file @@ -956,7 +956,6 @@ sub reconfig_urpmi { my $reconfigured = 0; my @reconfigurable = qw(url with_hdlist media_info_dir); - my $medium = name2medium($urpm, $name) or return; my %orig = %$medium; URLS: @@ -984,7 +983,7 @@ sub reconfig_urpmi { if ($reconfigured) { $urpm->{log}(N("reconfiguration done")); - write_config($urpm); + $urpm->{modified} = 1; } $reconfigured; } |