diff options
author | Francois Pons <fpons@mandriva.com> | 2003-08-20 12:26:11 +0000 |
---|---|---|
committer | Francois Pons <fpons@mandriva.com> | 2003-08-20 12:26:11 +0000 |
commit | c87df38b9bf873beefc9a3364f141685edb8457e (patch) | |
tree | 944536bf2399b65a3bb6936665c2fbb3a56580ac | |
parent | 16d86177611bd43b282ea24d8aa0a03979eab1bc (diff) | |
download | urpmi-c87df38b9bf873beefc9a3364f141685edb8457e.tar urpmi-c87df38b9bf873beefc9a3364f141685edb8457e.tar.gz urpmi-c87df38b9bf873beefc9a3364f141685edb8457e.tar.bz2 urpmi-c87df38b9bf873beefc9a3364f141685edb8457e.tar.xz urpmi-c87df38b9bf873beefc9a3364f141685edb8457e.zip |
modified log to be more clear.
-rw-r--r-- | urpm.pm | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1816,7 +1816,6 @@ this could happen if you mounted manually the directory when creating the medium #- the key has not been found, this is important to import it now, #- update keys hash (as we do not know how to get key id from its content). #- and parse again to found the key. - $urpm->{log}(N("...importing pubkey file of \"%s\"", $medium->{name})); $urpm->import_armored_file("$urpm->{cachedir}/partial/pubkey", root => $urpm->{root}); $urpm->parse_pubkeys(root => $urpm->{root}); @@ -1825,7 +1824,11 @@ this could happen if you mounted manually the directory when creating the medium } #- now id should be defined, or there is a problem to import the keys... - $id or $urpm->{error}(N("unable to import pubkey file of \"%s\"", $medium->{name})); + if ($id) { + $urpm->{log}(N("...imported key %s from pubkey file of \"%s\"", $id, $medium->{name})); + } else { + $urpm->{error}(N("unable to import pubkey file of \"%s\"", $medium->{name})); + } } } }; |