Skip to content

Commit

Permalink
Merge bugfix into stable (google#324)
Browse files Browse the repository at this point in the history
* Add Feitian OpenSK USB Dongle (google#257)

Co-authored-by: superskybird <[email protected]>

* Fix `config.py` tool according to the new API of fido2 python package (google#284)

* Fix fido2 API update.

Since fido2 0.8.1 the device descriptor moved to NamedTuple, breaking
our configuration tool.
Code is now updated accordingly and the setup script ensure we're
using the correct version for fido2 package.

* Make Yapf happy

* Fix missing update for fido2 0.9.1

Also split the comment into 2 lines so that the touch is not hidden
at the end of the screen.

* adds README changes, logo and certificate (google#285)

* Fix broken parsing. (google#317)

* Fix broken parsing.

By setting the default value before pre-parsing we ensure that the item
can't be None. As an extra safety the custom action also checks for
None.

Co-authored-by: Geoffrey <[email protected]>
Co-authored-by: superskybird <[email protected]>
Co-authored-by: kaczmarczyck <[email protected]>
  • Loading branch information
4 people authored Jun 9, 2021
1 parent 5e682d9 commit 7e5e2a6
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@ def __call__(self, parser, namespace, values, option_string=None):
# https://github.com/python/cpython/blob/master/Lib/argparse.py#L138-L147
# https://github.com/python/cpython/blob/master/Lib/argparse.py#L1028-L1052
items = getattr(namespace, self.dest, [])
if items is None:
items = []
if isinstance(items, list):
items = items[:]
else:
Expand Down Expand Up @@ -916,6 +918,8 @@ def main(args):
help=("When set, the output of elf2tab is appended to this file."),
)

main_parser.set_defaults(features=["with_ctap1"])

# Start parsing to know if we're going to list things or not.
partial_args, _ = main_parser.parse_known_args()

Expand Down Expand Up @@ -977,6 +981,4 @@ def main(args):
help=("Compiles and installs the nfct_test example that tests the "
"NFC driver."))

main_parser.set_defaults(features=["with_ctap1"])

main(main_parser.parse_args())

0 comments on commit 7e5e2a6

Please sign in to comment.