Skip to content

Commit ac9e5d8

Browse files
committed
Reverting accidental documentation change back to what was designed/intended in 5.12
1 parent af74e2d commit ac9e5d8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

guidelines/oval-schema-documentation/independent-definitions-schema.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ Child Elements
717717

718718
< shellcommand_object >
719719
---------------------------------------------------------
720-
The shellcommand_object is used by a shellcommand_test to define a shell to use (e.g. sh, bash, ksh, etc.), a command (or shell script) to be run, and a pattern to filter result lines. The default shell is bash. Each object extends the standard ObjectType as defined in the oval-definitions-schema and one should refer to the ObjectType description for more information. The common set element allows complex objects to be created using filters and set logic. The evaluation of the object should always produce at least one item. If the command execution does not produce output, an item should still be created with the exit_status (AKA process exit code), a stdout entity with a status of 'does not exist', and any STDERR from the execution captured in stderr_line entities. If the command returns multiple lines of standard out, mulitple items should be created, one for each line.
720+
The shellcommand_object is used by a shellcommand_test to define a shell to use (e.g. sh, bash, ksh, etc.), a command (or shell script) to be run, and a pattern to filter result lines. The default shell is bash. Each object extends the standard ObjectType as defined in the oval-definitions-schema and one should refer to the ObjectType description for more information. The common set element allows complex objects to be created using filters and set logic. The evaluation of the object should always produce one item. If the command execution does not produce output, an item should still be created with the exit_status (AKA process exit code), a stdout entity with a status of 'does not exist', and any STDERR from the execution captured in stderr_line entities.
721721

722722
**Extends:** oval-def:ObjectType
723723

oval-schemas/independent-definitions-schema.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ IMPORTANT! - Since this test requires the running of code supplied by content an
10221022
<xsd:annotation>
10231023
<xsd:documentation>The shellcommand_object is used by a shellcommand_test to define a shell to use (e.g. sh, bash, ksh, etc.), a command (or shell script) to be run, and a pattern to filter result lines. The default shell is bash. Each object extends the standard ObjectType as defined in the oval-definitions-schema and one should refer to the ObjectType description for more information. The common set element allows complex objects to be created using filters and set logic.
10241024

1025-
The evaluation of the object should always produce at least one item. If the command execution does not produce output, an item should still be created with the exit_status (AKA process exit code), a stdout entity with a status of 'does not exist', and any STDERR from the execution captured in stderr_line entities. If the command returns multiple lines of standard out, mulitple items should be created, one for each line.
1025+
The evaluation of the object should always produce one item. If the command execution does not produce output, an item should still be created with the exit_status (AKA process exit code), a stdout entity with a status of 'does not exist', and any STDERR from the execution captured in stderr_line entities.
10261026
</xsd:documentation>
10271027
<xsd:appinfo>
10281028
<sch:pattern id="ind-def_shellcommand_object_verify_filter_state">

0 commit comments

Comments
 (0)