summaryrefslogtreecommitdiffstats
path: root/urpm/media.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-24 10:20:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-24 10:20:09 +0000
commita3ebda940b2d75d0a28e4b250ce6a23de06f9bba (patch)
tree1f04c7a5af27384c3b084213e014b91b5551b30e /urpm/media.pm
parent5e1c20f181fac8df0636ecd04b24832ddb6cbc27 (diff)
downloadurpmi-a3ebda940b2d75d0a28e4b250ce6a23de06f9bba.tar
urpmi-a3ebda940b2d75d0a28e4b250ce6a23de06f9bba.tar.gz
urpmi-a3ebda940b2d75d0a28e4b250ce6a23de06f9bba.tar.bz2
urpmi-a3ebda940b2d75d0a28e4b250ce6a23de06f9bba.tar.xz
urpmi-a3ebda940b2d75d0a28e4b250ce6a23de06f9bba.zip
- urpmi, urpmi.addmedia, urpmi.update:
o have fatal errors on some errors that must not happen (eg: moving rpm from download dir to cachedir)
Diffstat (limited to 'urpm/media.pm')
-rw-r--r--urpm/media.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index 93b84628..6aff6977 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1153,14 +1153,14 @@ sub get_descriptions_remote {
unlink "$urpm->{cachedir}/partial/descriptions";
if (-e statedir_descriptions($urpm, $medium)) {
- urpm::util::move(statedir_descriptions($urpm, $medium), "$urpm->{cachedir}/partial/descriptions");
+ urpm::sys::move_or_die($urpm, statedir_descriptions($urpm, $medium), "$urpm->{cachedir}/partial/descriptions");
}
urpm::download::sync($urpm, $medium, [ reduce_pathname("$medium->{url}/media_info/descriptions") ], quiet => 1)
or #- try older location
urpm::download::sync($urpm, $medium, [ reduce_pathname("$medium->{url}/../descriptions") ], quiet => 1);
if (-e "$urpm->{cachedir}/partial/descriptions") {
- urpm::util::move("$urpm->{cachedir}/partial/descriptions", statedir_descriptions($urpm, $medium));
+ urpm::sys::move_or_die($urpm, "$urpm->{cachedir}/partial/descriptions", statedir_descriptions($urpm, $medium));
}
}
sub get_synthesis__local {
@@ -1486,12 +1486,12 @@ sub _update_medium_ {
#- use new files
unlink statedir_synthesis($urpm, $medium);
- urpm::util::move(cachedir_with_synthesis($urpm, $medium),
- statedir_synthesis($urpm, $medium));
+ urpm::sys::move_or_die($urpm, cachedir_with_synthesis($urpm, $medium),
+ statedir_synthesis($urpm, $medium));
unlink statedir_MD5SUM($urpm, $medium);
if (!$medium->{with_synthesis}) { # no MD5SUM when using with_synthesis, urpmi.update will update everytime!
- urpm::util::move("$urpm->{cachedir}/partial/MD5SUM",
+ urpm::sys::move_or_die($urpm, "$urpm->{cachedir}/partial/MD5SUM",
statedir_MD5SUM($urpm, $medium)) if -e "$urpm->{cachedir}/partial/MD5SUM";
}