Fixed swid_generator interface
This commit is contained in:
@@ -162,10 +162,9 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator,
|
|||||||
/* Assemble the SWID generator command */
|
/* Assemble the SWID generator command */
|
||||||
if (this->full_tags)
|
if (this->full_tags)
|
||||||
{
|
{
|
||||||
snprintf(command, BUF_LEN, "%s swid --entity-name \"%s\" %s%s",
|
snprintf(command, BUF_LEN, "%s swid --entity-name \"%s\" "
|
||||||
generator, entity_name,
|
"--doc-separator $'\n\n'%s%s", generator, entity_name,
|
||||||
pretty ? "--pretty" : "--doc-separator $'\n\n'",
|
pretty ? " --pretty" : "", full ? " --full" : "");
|
||||||
full ? " --full" : "");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -182,12 +181,12 @@ static status_t generate_tags(private_swid_inventory_t *this, char *generator,
|
|||||||
|
|
||||||
if (this->full_tags)
|
if (this->full_tags)
|
||||||
{
|
{
|
||||||
DBG2(DBG_IMC, "SWID tags generated by package manager:");
|
DBG2(DBG_IMC, "SWID tag generation by package manager");
|
||||||
status = read_swid_tags(this, file);
|
status = read_swid_tags(this, file);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DBG2(DBG_IMC, "SWID tag IDs generated by package manager:");
|
DBG2(DBG_IMC, "SWID tag ID generation by package manager");
|
||||||
status = read_swid_tag_ids(this, file);
|
status = read_swid_tag_ids(this, file);
|
||||||
}
|
}
|
||||||
pclose(file);
|
pclose(file);
|
||||||
|
|||||||
Reference in New Issue
Block a user