[Xen-devel] [OSSTEST PATCH 3/4] TestSupport: Honour $force option to package_install_cmd

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

From: Roger Pau Monné <roger.pau@xxxxxxxxxx>

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 Osstest/TestSupport.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 135cda3..0c57dcc 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -525,8 +525,8 @@ sub target_putfile_root ($$$$;$) {
     tputfileex('root', @_);
 }
 
-sub package_install_cmd ($;$) {
-    my ($ho, $norec) = @_;
+sub package_install_cmd ($;$$) {
+    my ($ho, $norec, $force) = @_;
     my @cmd;
 
     if ($ho->{OS} eq "freebsd") {
@@ -535,6 +535,7 @@ sub package_install_cmd ($;$) {
         push @cmd, qw(DEBIAN_PRIORITY=critical UCF_FORCE_CONFFOLD=y
                       with-lock-ex -w /var/lock/osstest-apt apt-get);
         push @cmd, qw(--no-install-recommends) if $norec;
+        push @cmd, qw(-f) if $force;
         push @cmd, qw(-y install);
     }
 
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel