summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.com>2006-09-21 10:28:37 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.com>2006-09-21 10:28:37 +0000
commit4e204cf007ddd09407c8d4142f5cbee36baee440 (patch)
tree9989c3c2acc37b95da46baa01f16b0b607f0f3f4 /urpm.pm
parentf5e4d61f680a64c3aadde13e9637bce26fcbf311 (diff)
downloadurpmi-4e204cf007ddd09407c8d4142f5cbee36baee440.tar
urpmi-4e204cf007ddd09407c8d4142f5cbee36baee440.tar.gz
urpmi-4e204cf007ddd09407c8d4142f5cbee36baee440.tar.bz2
urpmi-4e204cf007ddd09407c8d4142f5cbee36baee440.tar.xz
urpmi-4e204cf007ddd09407c8d4142f5cbee36baee440.zip
Fix some error messages
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/urpm.pm b/urpm.pm
index 00c9600d..8ca9994e 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -771,12 +771,11 @@ sub add_distrib_media {
my $distribconf;
if (my ($dir) = $url =~ m!^(?:removable[^:]*:/|file:/)?(/.*)!) {
- # FIXME obscure error message
$urpm->try_mounting($dir)
- or $urpm->{error}(N("unable to access first installation medium")), return ();
+ or $urpm->{error}(N("unable to mount the distribution medium")), return ();
$distribconf = MDV::Distribconf->new($dir);
- # FIXME ugly error message
- $distribconf->load() or $urpm->{error}(N("this url seems to not contain any distrib")), return ();
+ $distribconf->load()
+ or $urpm->{error}(N("this location doesn't seem to contain any distribution")), return ();
} else {
unlink "$urpm->{cachedir}/partial/media.cfg";
@@ -803,7 +802,7 @@ sub add_distrib_media {
$distribconf->parse_mediacfg("$urpm->{cachedir}/partial/media.cfg")
or $urpm->{error}(N("unable to parse media.cfg")), return();
} else {
- $urpm->{error}(N("unable to access first installation medium (no hdlists file found)"));
+ $urpm->{error}(N("unable to access the distribution medium (no media.cfg file found)"));
return ();
}
}