diff options
| author | Chris Harris <chris.harris@kitware.com> | 2012-02-16 16:26:08 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <sop@google.com> | 2012-02-16 13:36:37 -0800 |
| commit | dc225268721fec39010c9faeeb5980805b5e9bb7 (patch) | |
| tree | 4a12920f0c76d07b96675aa22f301c90430a7f0a | |
| parent | 74aaa1ac99660a14e6f61d93f66395361f993271 (diff) | |
Fix NoBlock and NoOp prolog rules
Both NoBlock and NoOp category functions where blocking change submission.
The rules need a !, before the T=OK to cut the other alternative
off.
Change-Id: I9bdf7bdeb70f6efd4ac1c2a16c5c085b14fb0d6c
Suggested-By: Shawn Pearce sop@google.com
| -rw-r--r-- | gerrit-server/src/main/prolog/gerrit_common.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gerrit-server/src/main/prolog/gerrit_common.pl b/gerrit-server/src/main/prolog/gerrit_common.pl index 42ad519dc9..1780c6f753 100644 --- a/gerrit-server/src/main/prolog/gerrit_common.pl +++ b/gerrit-server/src/main/prolog/gerrit_common.pl @@ -198,8 +198,8 @@ default_submit([Type | Types], Tmp, Out) :- %% legacy_submit_rule('MaxWithBlock', Label, Id, Min, Max, T) :- !, max_with_block(Label, Min, Max, T). legacy_submit_rule('MaxNoBlock', Label, Id, Min, Max, T) :- !, max_no_block(Label, Max, T). -legacy_submit_rule('NoBlock', Label, Id, Min, Max, T) :- T = ok(_), true. -legacy_submit_rule('NoOp', Label, Id, Min, Max, T) :- T = ok(_), true. +legacy_submit_rule('NoBlock', Label, Id, Min, Max, T) :- !, T = ok(_). +legacy_submit_rule('NoOp', Label, Id, Min, Max, T) :- !, T = ok(_). legacy_submit_rule(Fun, Label, Id, Min, Max, T) :- T = impossible(unsupported(Fun)). |