From 19426864f2b204fcb2e3d20b8c0262978162a089 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 3 Dec 2009 17:41:04 +0000 Subject: remove --root option that was deprecated since August 2007 (rationale: its meaning conflicts with urpmi's --root one) --- NEWS | 1 + Rpmdrake/init.pm | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 4134b6d2..4bd52432 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,4 @@ +- remove --root option that was deprecated since August 2007 - use gtksourceview-2 instead of gtksourceview-1 - rpmdrake: o fix crashing when running as user (#55009) diff --git a/Rpmdrake/init.pm b/Rpmdrake/init.pm index 6a94c204..5a0ea01a 100644 --- a/Rpmdrake/init.pm +++ b/Rpmdrake/init.pm @@ -59,7 +59,6 @@ N(" --no-verify-rpm don't verify packages signatures"), if_($0 !~ /MandrivaUpdate/, N(" --parallel=alias,host be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps")), N(" --rpm-root=path use another root for rpm installation"), N(" --urpmi-root use another root for urpmi db & rpm installation"), -N(" --root force to run as root") . ' ' . N("(Deprecated)"), N(" --run-as-root force to run as root"), N(" --search=pkg run search for \"pkg\""), N(" --test only verify if the installation can be achieved correctly"), @@ -143,7 +142,7 @@ if ($MODE eq 'remove') { $default_list_mode = 'all_updates'; } -$MODE eq 'update' || $rpmdrake_options{'run-as-root'} || $rpmdrake_options{root} and require_root_capability(); +$MODE eq 'update' || $rpmdrake_options{'run-as-root'} and require_root_capability(); $::noborderWhenEmbedded = 1; require rpmdrake; -- cgit v1.2.1