summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-10 15:56:00 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-10 15:56:00 +0000
commit13699ad59fac6ddfb0456e5bf140814fdd7cf576 (patch)
tree7a77a094ed1aeeb08c6c44453898a5887f4b98bd
parentf181e51ca1035cbdc57f00479074f724c4a29c6f (diff)
downloadurpmi-13699ad59fac6ddfb0456e5bf140814fdd7cf576.tar
urpmi-13699ad59fac6ddfb0456e5bf140814fdd7cf576.tar.gz
urpmi-13699ad59fac6ddfb0456e5bf140814fdd7cf576.tar.bz2
urpmi-13699ad59fac6ddfb0456e5bf140814fdd7cf576.tar.xz
urpmi-13699ad59fac6ddfb0456e5bf140814fdd7cf576.zip
In test mode, don't scare the user and tell him that no package will be
actually installed or removed.
-rw-r--r--pod/urpmi.8.pod4
-rwxr-xr-xurpmi6
2 files changed, 8 insertions, 2 deletions
diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod
index c3f74388..7d761965 100644
--- a/pod/urpmi.8.pod
+++ b/pod/urpmi.8.pod
@@ -254,8 +254,8 @@ by default.
=item B<--test>
-Test (same as B<rpm --test>) installation of packages but do
-not modify the system.
+Test the installation of packages but do not actually install anything or
+modify the system. (That's the same as B<rpm --test>).
=item B<--excludepath> I<string>
diff --git a/urpmi b/urpmi
index bfb9eae5..985b494d 100755
--- a/urpmi
+++ b/urpmi
@@ -486,6 +486,9 @@ have to be removed for others to be upgraded:\n%s\n", $list));
}
my $msg = N("The following packages have to be removed for others to be upgraded:\n%s", $list);
+ if ($test) {
+ $msg = "$msg\n" . N("(test only, removal will not be actually done)");
+ }
if ($urpm->{options}{auto}) {
message($msg);
} else {
@@ -534,6 +537,9 @@ if (@root_only) {
my $msg = $#to_install
? N("To satisfy dependencies, the following packages are going to be installed")
: N("To satisfy dependencies, the following package is going to be installed");
+ if ($test) {
+ $msg = "$msg\n" . N("(test only, installation will not be actually done)");
+ }
my $msg2 = N("Proceed with the installation of the %d packages? (%d MB)", $urpm->{nb_install}, toMb($sum));
my $p = join "\n", @to_install;
my $noexpr = N("Nn");