From 65304a86977b772f11eca3fe7221c6f140640a8c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 13 Mar 2008 13:37:56 +0000
Subject: handle --force

---
 NEWS         | 1 +
 gurpmi2      | 1 +
 urpm/args.pm | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

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};
 }
-- 
cgit v1.2.1