summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-13 13:37:56 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-13 13:37:56 +0000
commit65304a86977b772f11eca3fe7221c6f140640a8c (patch)
treead3925d2a1cf7785d9163538a9b4456a872ce321
parent9240adc3a5a7bc52bbe5566893010baa438cc53b (diff)
downloadurpmi-65304a86977b772f11eca3fe7221c6f140640a8c.tar
urpmi-65304a86977b772f11eca3fe7221c6f140640a8c.tar.gz
urpmi-65304a86977b772f11eca3fe7221c6f140640a8c.tar.bz2
urpmi-65304a86977b772f11eca3fe7221c6f140640a8c.tar.xz
urpmi-65304a86977b772f11eca3fe7221c6f140640a8c.zip
handle --force
-rw-r--r--NEWS1
-rwxr-xr-xgurpmi21
-rw-r--r--urpm/args.pm2
3 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ed603475..44f074ed 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
o ensure rpm error message are always in UTF-8
o ensure urpmi messages are always in UTF-8
o return urpmi error code
+ o handle --force
Version 5.11 - 11 March 2008, by Pascal "Pixel" Rigaux
diff --git a/gurpmi2 b/gurpmi2
index 28affc76..5339daa7 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -24,6 +24,7 @@ use Gtk2;
#- default options.
our $allow_medium_change = 0;
our $auto_select = 0;
+our $force = 0;
our $test = 0;
#- GUI globals
diff --git a/urpm/args.pm b/urpm/args.pm
index 120118a2..b34e461e 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -370,7 +370,7 @@ sub add_urpmf_parameter {
# common options setup
-foreach my $k ('allow-medium-change', 'auto', 'auto-select', 'expect-install!', 'no-priority-upgrade', 'previous-priority-upgrade=s', 'root=s', 'test!', 'verify-rpm!')
+foreach my $k ('allow-medium-change', 'auto', 'auto-select', 'force', 'expect-install!', 'no-priority-upgrade', 'previous-priority-upgrade=s', 'root=s', 'test!', 'verify-rpm!')
{
$options_spec{gurpmi}{$k} = $options_spec{urpmi}{$k};
}