summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-08 11:19:04 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-08 11:19:04 +0000
commit645da8937a484bde2335b01498279577a826b6dd (patch)
treef7930ed1865fe72d5a4880b48f756e123e2abb96
parent955874c2d22504d8cadceb8daec0511d842d944f (diff)
downloadurpmi-645da8937a484bde2335b01498279577a826b6dd.tar
urpmi-645da8937a484bde2335b01498279577a826b6dd.tar.gz
urpmi-645da8937a484bde2335b01498279577a826b6dd.tar.bz2
urpmi-645da8937a484bde2335b01498279577a826b6dd.tar.xz
urpmi-645da8937a484bde2335b01498279577a826b6dd.zip
s/cooker/cauldron/
-rw-r--r--pod/urpmi.addmedia.8.pod4
-rw-r--r--urpm/media.pm2
2 files changed, 3 insertions, 3 deletions
diff --git a/pod/urpmi.addmedia.8.pod b/pod/urpmi.addmedia.8.pod
index a2a25f22..d5d233e8 100644
--- a/pod/urpmi.addmedia.8.pod
+++ b/pod/urpmi.addmedia.8.pod
@@ -223,8 +223,8 @@ The architecture (if found in F</etc/release>).
=item B<$RELEASE>
-The OS release (if found in F</etc/release>; its value should be B<cooker>
-on a Mageia cooker system.)
+The OS release (if found in F</etc/release>; its value should be B<cauldron>
+on a Mageia cauldron system.)
=item B<$HOST>
diff --git a/urpm/media.pm b/urpm/media.pm
index 6caf3b8a..b972883a 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1237,7 +1237,7 @@ sub may_reconfig_urpmi {
#-
#- example of reconfig.urpmi:
#- # this is an urpmi reconfiguration file
-#- /cooker /cooker/$ARCH
+#- /cauldron /cauldron/$ARCH
sub reconfig_urpmi {
my ($urpm, $rfile, $medium) = @_;
-r $rfile or return;