summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-20 08:54:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-20 08:54:30 +0000
commit709f56043b97de033cbb83f21ef27e64d91a480b (patch)
treede3c7781ce9500caf4ddaae9038641892e55f5ff /urpm
parent0ea81217c300f79da0b8571044d73ee347414c15 (diff)
downloadurpmi-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
Diffstat (limited to 'urpm')
-rw-r--r--urpm/media.pm5
1 files changed, 5 insertions, 0 deletions
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') {