diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-10-20 08:54:30 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-10-20 08:54:30 +0000 |
| commit | 709f56043b97de033cbb83f21ef27e64d91a480b (patch) | |
| tree | de3c7781ce9500caf4ddaae9038641892e55f5ff | |
| parent | 0ea81217c300f79da0b8571044d73ee347414c15 (diff) | |
| download | urpmi-709f56043b97de033cbb83f21ef27e64d91a480b.tar urpmi-709f56043b97de033cbb83f21ef27e64d91a480b.tar.gz urpmi-709f56043b97de033cbb83f21ef27e64d91a480b.tar.bz2 urpmi-709f56043b97de033cbb83f21ef27e64d91a480b.tar.xz urpmi-709f56043b97de033cbb83f21ef27e64d91a480b.zip | |
- urpmi.update
o fix --force-key (#45094)
nb: 2 cases must be handled. When the medium is updated, we just need to
ensure urpmi.cfg is written. But when it's not updated, we must do a special
case
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/media.pm | 5 |
2 files changed, 7 insertions, 0 deletions
@@ -3,6 +3,8 @@ - gurpmi o display the download errors o log all urpmi logs +- urpmi.update + o fix --force-key (#45094) - urpmi.addmedia o do not allow "/" in media name (#44765) diff --git a/urpm/media.pm b/urpm/media.pm index 2c12ca84..3a21a0aa 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -1513,6 +1513,7 @@ sub _get_pubkey { ($local ? \&_get_pubkey__local : \&_download_pubkey)->($urpm, $medium); $medium->{'key-ids'} =_read_cachedir_pubkey($urpm, $medium, $b_wait_lock); + $urpm->{modified} = 1; } sub _get_pubkey_and_descriptions { @@ -1577,6 +1578,10 @@ sub _update_medium_ { if ($options{forcekey}) { delete $medium->{'key-ids'}; + if ($rc eq 'unmodified') { + _get_pubkey($urpm, $medium); # we must do it now, quite hackish... + return 1; + } } if (!$rc || $rc eq 'unmodified') { |