summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-12-13 12:51:15 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-12-13 12:51:15 +0000
commite77a18dfd41404c9d6d28597db08e09f6280fb2e (patch)
tree8fd31821e11ca269420bedda508e16d6a6c3b3cf /urpm.pm
parent4d6c40d3ee56bd0e202bb63f6c7e5f4bb09d9121 (diff)
downloadurpmi-e77a18dfd41404c9d6d28597db08e09f6280fb2e.tar
urpmi-e77a18dfd41404c9d6d28597db08e09f6280fb2e.tar.gz
urpmi-e77a18dfd41404c9d6d28597db08e09f6280fb2e.tar.bz2
urpmi-e77a18dfd41404c9d6d28597db08e09f6280fb2e.tar.xz
urpmi-e77a18dfd41404c9d6d28597db08e09f6280fb2e.zip
Adding a media should not fail when there is no pubkey file available
(bug #12646)
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/urpm.pm b/urpm.pm
index 43454027..ec314764 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1306,7 +1306,7 @@ this could happen if you mounted manually the directory when creating the medium
-e $path_pubkey or $path_pubkey = "$dir/pubkey";
if ($path_pubkey) {
urpm::util::copy($path_pubkey, "$urpm->{cachedir}/partial/pubkey")
- or do { $urpm->{error}(N("...copying failed")); $error = 1 };
+ or do { $urpm->{error}(N("...copying failed")) };
}
chown 0, 0, "$urpm->{cachedir}/partial/pubkey";
}
@@ -1752,7 +1752,7 @@ this could happen if you mounted manually the directory when creating the medium
unless ($medium->{virtual}) {
if ($error) {
- #- an error has occured for updating the medium, we have to remove tempory files.
+ #- an error has occured for updating the medium, we have to remove temporary files.
unlink "$urpm->{cachedir}/partial/$medium->{hdlist}";
$medium->{list} and unlink "$urpm->{cachedir}/partial/$medium->{list}";
#- read default synthesis (we have to make sure nothing get out of depslist).
@@ -1783,7 +1783,7 @@ this could happen if you mounted manually the directory when creating the medium
if ($medium->{list}) {
urpm::util::move("$urpm->{cachedir}/partial/$medium->{list}", "$urpm->{statedir}/$medium->{list}");
}
- $medium->{md5sum} = $retrieved_md5sum; #- anyway, keep it, the previous one is no more usefull.
+ $medium->{md5sum} = $retrieved_md5sum; #- anyway, keep it, the previous one is no more useful.
#- and create synthesis file associated.
$medium->{modified_synthesis} = !$medium->{synthesis};