Skip to content

Fix string formatting #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 29, 2019
Merged

Fix string formatting #235

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2644ae7
Fix string formatting
oh6hay Oct 22, 2019
aaa0c51
undelete empty line
oh6hay Oct 22, 2019
f14b200
hmm, one more
oh6hay Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cve_bin_tool/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def get_cves(self, vendor_package_pairs, vers):

for i in range(len(vendor_package_pairs)):
vendor_package_pairs[i] = tuple(vendor_package_pairs[i])[:2] + (
"%" + vers + "%",
"%" + str(vers) + "%",
)

# here we don't need to grab all of the versions
Expand Down Expand Up @@ -195,7 +195,7 @@ def scan_file(self, filename):
if self.verbose:
print(filename, result["is_or_contains"], modulename, version)
if found_cves.keys():
print("Known CVEs in version " + version)
print("Known CVEs in version " + str(version))
print(", ".join(found_cves.keys()))

self.logger.debug("Done scanning file: %r", filename)
Expand Down Expand Up @@ -418,7 +418,7 @@ def main(argv=sys.argv, outfile=sys.stdout):
if (not args.quiet) and scanner.files_with_cve > 0:
affected_string = ", ".join(
map(
lambda module_version: " ".join(module_version),
lambda module_version: " ".join(str(module_version)),
scanner.affected(),
)
)
Expand Down