summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--t/superuser--should-restart.t6
-rw-r--r--urpm/main_loop.pm2
2 files changed, 5 insertions, 3 deletions
diff --git a/t/superuser--should-restart.t b/t/superuser--should-restart.t
index 737ab311..04e0c9c5 100644
--- a/t/superuser--should-restart.t
+++ b/t/superuser--should-restart.t
@@ -2,9 +2,11 @@
# "a" provides "should-restart = system"
# "c" provides "should-restart = system"
-# this test fails since the "restart your computer" message was disabled when
+
+# this test would fail since the "restart your computer" message was disabled when
# urpmi is run with --urpmi-root
-#
+$ENV{URPMI_TEST_RESTART} = 1;
+
use strict;
use lib '.', 't';
use helper;
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index f9e9f37e..5489bebc 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -365,7 +365,7 @@ sub run {
sub handle_need_restart {
my ($urpm, $state, $callbacks) = @_;
- return if $urpm->{root};
+ return if $urpm->{root} && !$ENV{URPMI_TEST_RESTART};
return if !$callbacks->{need_restart};
if (intersection([ keys %{$state->{selected}} ],