Skip to content

Commit 18ee00a

Browse files
authored
Merge pull request #5729 from btriller/cf-agent-files
cf-agent/verify_files: Drop duplicate check on present select attribute
2 parents 63db2bc + 0d48598 commit 18ee00a

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

cf-agent/verify_files.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static bool FileSanityChecks(char *path, const Attributes *a, const Promise *pp)
130130

131131
if ((a->haveselect) && (!a->select.result))
132132
{
133-
Log(LOG_LEVEL_ERR, "File select constraint body promised no result (check body definition)");
133+
Log(LOG_LEVEL_ERR, "File selection failed: check file_select body definition; file_result attribute is not defined.");
134134
PromiseRef(LOG_LEVEL_ERR, pp);
135135
return false;
136136
}
@@ -165,13 +165,6 @@ static bool FileSanityChecks(char *path, const Attributes *a, const Promise *pp)
165165
return false;
166166
}
167167

168-
if ((a->haveselect) && (a->select.result == NULL))
169-
{
170-
Log(LOG_LEVEL_ERR, "Missing file_result attribute in file_select body");
171-
PromiseRef(LOG_LEVEL_ERR, pp);
172-
return false;
173-
}
174-
175168
if ((a->havedepthsearch) && (a->change.report_diffs))
176169
{
177170
Log(LOG_LEVEL_ERR, "Difference reporting is not allowed during a depth_search");

0 commit comments

Comments
 (0)