aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-28 08:56:27 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-28 08:56:27 +0100
commit219d98ec313f033e8979876189e0cc35838f2880 (patch)
treeb1967ba92af45e582f05e92fb2ab7d78790032e8
parent2c15f54827106e0cebcd064d55c7fd77f5cad604 (diff)
downloadpaludis-219d98ec313f033e8979876189e0cc35838f2880.tar.gz
paludis-219d98ec313f033e8979876189e0cc35838f2880.tar.xz
Fix more continue-on-failure failure
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index ff3a585..7b44d44 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -1200,12 +1200,13 @@ namespace
}
}
+ int current_global_retcode;
{
Lock lock(global_retcode_mutex);
- local_retcode |= global_retcode;
+ current_global_retcode = global_retcode;
}
- if ((0 != local_retcode) && want)
+ if ((0 != local_retcode || 0 != current_global_retcode) && want)
{
if (last_jri == require_if)
want = false;