|
 |
e95b98 |
commit 343aef25472baa74c3a4669cf86b670d93d41dcb
|
|
|
e95b98 |
Author: Nathan Scott <nathans@redhat.com>
|
|
|
e95b98 |
Date: Tue Nov 23 16:11:24 2021 +1100
|
|
|
e95b98 |
|
|
|
e95b98 |
pmlogconf: fix reprobing with interactive changes
|
|
|
e95b98 |
|
|
|
e95b98 |
In testing an earlier persistance fix it was discovered
|
|
|
e95b98 |
that reprobe was inadvertently overwriting user requests
|
|
|
e95b98 |
for changes interactively.
|
|
|
e95b98 |
|
|
|
e95b98 |
Related to Red Hat BZ #2017632
|
|
|
e95b98 |
|
|
|
e95b98 |
diff --git a/qa/368.out b/qa/368.out
|
|
|
e95b98 |
index 829162f859..179a1142cf 100644
|
|
|
e95b98 |
--- a/qa/368.out
|
|
|
e95b98 |
+++ b/qa/368.out
|
|
|
e95b98 |
@@ -80,44 +80,10 @@ Differences ...
|
|
|
e95b98 |
Keep changes? [y]
|
|
|
e95b98 |
Group: qa group one
|
|
|
e95b98 |
Log this group? [y] ...
|
|
|
e95b98 |
-Differences ...
|
|
|
e95b98 |
-*** TMP.orig ...
|
|
|
e95b98 |
---- TMP.conf.new ...
|
|
|
e95b98 |
-***************
|
|
|
e95b98 |
-*** 22,35 ****
|
|
|
e95b98 |
- sample.long.million
|
|
|
e95b98 |
- }
|
|
|
e95b98 |
- #----
|
|
|
e95b98 |
-! #+ 02:x::
|
|
|
e95b98 |
-! #----
|
|
|
e95b98 |
-! #+ 03:y:default:
|
|
|
e95b98 |
-! ## qa group three
|
|
|
e95b98 |
- log advisory on default {
|
|
|
e95b98 |
-! sample.longlong.ten
|
|
|
e95b98 |
- }
|
|
|
e95b98 |
- #----
|
|
|
e95b98 |
- #+ 04:n:default:
|
|
|
e95b98 |
- ## qa group four
|
|
|
e95b98 |
- #----
|
|
|
e95b98 |
---- 22,36 ----
|
|
|
e95b98 |
- sample.long.million
|
|
|
e95b98 |
- }
|
|
|
e95b98 |
- #----
|
|
|
e95b98 |
-! #+ 02:y:default:
|
|
|
e95b98 |
-! ## qa group two
|
|
|
e95b98 |
- log advisory on default {
|
|
|
e95b98 |
-! sample.ulong.ten
|
|
|
e95b98 |
- }
|
|
|
e95b98 |
- #----
|
|
|
e95b98 |
-+ #+ 03:n:default:
|
|
|
e95b98 |
-+ ## qa group three
|
|
|
e95b98 |
-+ #----
|
|
|
e95b98 |
- #+ 04:n:default:
|
|
|
e95b98 |
- ## qa group four
|
|
|
e95b98 |
- #----
|
|
|
e95b98 |
-Keep changes? [y]
|
|
|
e95b98 |
+No changes
|
|
|
e95b98 |
+
|
|
|
e95b98 |
Group: qa group one
|
|
|
e95b98 |
-Log this group? [y] ......
|
|
|
e95b98 |
+Log this group? [y] .....
|
|
|
e95b98 |
Differences ...
|
|
|
e95b98 |
*** TMP.orig ...
|
|
|
e95b98 |
--- TMP.conf.new ...
|
|
|
e95b98 |
@@ -132,18 +98,8 @@ Differences ...
|
|
|
e95b98 |
#----
|
|
|
e95b98 |
--- 18,23 ----
|
|
|
e95b98 |
***************
|
|
|
e95b98 |
-*** 26,31 ****
|
|
|
e95b98 |
---- 25,31 ----
|
|
|
e95b98 |
- ## qa group two
|
|
|
e95b98 |
- log advisory on default {
|
|
|
e95b98 |
- sample.ulong.ten
|
|
|
e95b98 |
-+ sample.ulong.million
|
|
|
e95b98 |
- }
|
|
|
e95b98 |
- #----
|
|
|
e95b98 |
- #+ 03:n:default:
|
|
|
e95b98 |
-***************
|
|
|
e95b98 |
-*** 37,42 ****
|
|
|
e95b98 |
---- 37,53 ----
|
|
|
e95b98 |
+*** 36,41 ****
|
|
|
e95b98 |
+--- 35,51 ----
|
|
|
e95b98 |
#+ 05:n:default:
|
|
|
e95b98 |
## qa group five
|
|
|
e95b98 |
#----
|
|
|
e95b98 |
@@ -185,15 +141,13 @@ log advisory on default {
|
|
|
e95b98 |
sample.long.million
|
|
|
e95b98 |
}
|
|
|
e95b98 |
#----
|
|
|
e95b98 |
-#+ 02:y:default:
|
|
|
e95b98 |
-## qa group two
|
|
|
e95b98 |
-log advisory on default {
|
|
|
e95b98 |
- sample.ulong.ten
|
|
|
e95b98 |
- sample.ulong.million
|
|
|
e95b98 |
-}
|
|
|
e95b98 |
+#+ 02:x::
|
|
|
e95b98 |
#----
|
|
|
e95b98 |
-#+ 03:n:default:
|
|
|
e95b98 |
+#+ 03:y:default:
|
|
|
e95b98 |
## qa group three
|
|
|
e95b98 |
+log advisory on default {
|
|
|
e95b98 |
+ sample.longlong.ten
|
|
|
e95b98 |
+}
|
|
|
e95b98 |
#----
|
|
|
e95b98 |
#+ 04:n:default:
|
|
|
e95b98 |
## qa group four
|
|
|
e95b98 |
diff --git a/src/pmlogconf/pmlogconf.c b/src/pmlogconf/pmlogconf.c
|
|
|
e95b98 |
index c03c61e797..fa1156859d 100644
|
|
|
e95b98 |
--- a/src/pmlogconf/pmlogconf.c
|
|
|
e95b98 |
+++ b/src/pmlogconf/pmlogconf.c
|
|
|
e95b98 |
@@ -913,13 +913,13 @@ evaluate_state(group_t *group)
|
|
|
e95b98 |
if ((group->pmlogger || group->pmrep) && !group->pmlogconf) {
|
|
|
e95b98 |
state = group->saved_state;
|
|
|
e95b98 |
} else if (evaluate_group(group)) { /* probe */
|
|
|
e95b98 |
- if (reprobe == 0 && group->saved_state != 0)
|
|
|
e95b98 |
+ if (group->saved_state != 0)
|
|
|
e95b98 |
state = group->saved_state;
|
|
|
e95b98 |
else
|
|
|
e95b98 |
state = group->true_state;
|
|
|
e95b98 |
group->success = 1;
|
|
|
e95b98 |
} else {
|
|
|
e95b98 |
- if (reprobe == 0 && group->saved_state != 0)
|
|
|
e95b98 |
+ if (group->saved_state != 0)
|
|
|
e95b98 |
state = group->saved_state;
|
|
|
e95b98 |
else
|
|
|
e95b98 |
state = group->false_state;
|