Skip to content

Commit

Permalink
Merge pull request #925 from tanjunchen/fix-up-typo
Browse files Browse the repository at this point in the history
fix-up some spelling mistakes
  • Loading branch information
JustinCappos authored Sep 26, 2019
2 parents df1c749 + 04019a1 commit 9fde70f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions tests/test_key_revocation_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def test_snapshot_key_revocation(self):
# because the timestamp key has changed; Snapshot, because Root has
# changed, and Timesamp, because it must sign its metadata with a new key.
repository.root.load_signing_key(self.role_keys['root']['private'])
# Note: we added Timetamp's key to the Snapshot role.
# Note: we added Timestamp's key to the Snapshot role.
repository.snapshot.load_signing_key(self.role_keys['timestamp']['private'])
repository.timestamp.load_signing_key(self.role_keys['timestamp']['private'])
repository.writeall()
Expand Down Expand Up @@ -306,7 +306,7 @@ def test_targets_key_revocation(self):
# because the timestamp key has changed; Snapshot, because Root has
# changed, and Timestamp because it must sign its metadata with a new key.
repository.root.load_signing_key(self.role_keys['root']['private'])
# Note: we added Timetamp's key to the Targets role.
# Note: we added Timestamp's key to the Targets role.
repository.targets.load_signing_key(self.role_keys['timestamp']['private'])
repository.snapshot.load_signing_key(self.role_keys['snapshot']['private'])
repository.timestamp.load_signing_key(self.role_keys['timestamp']['private'])
Expand Down Expand Up @@ -362,7 +362,7 @@ def test_root_key_revocation(self):
repository.root.load_signing_key(self.role_keys['targets']['private'])
repository.root.load_signing_key(self.role_keys['timestamp']['private'])

# Note: We added the Snapshot, Targets, and Timetamp keys to the Root role.
# Note: We added the Snapshot, Targets, and Timestampkeys to the Root role.
# The Root's expected private key has not been loaded yet, so that we can
# verify that refresh() correctly raises a
# securesystemslib.exceptions.BadSignatureError exception.
Expand Down
2 changes: 1 addition & 1 deletion tuf/keydb.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def create_keydb_from_root_metadata(root_metadata, repository_name='default'):
add_key(key_dict, keyid=None, repository_name=repository_name)

# Although keyid duplicates should *not* occur (unique dict keys), log a
# warning and continue. Howerver, 'key_dict' may have already been
# warning and continue. However, 'key_dict' may have already been
# adding to the keydb elsewhere.
except tuf.exceptions.KeyAlreadyExistsError as e: # pragma: no cover
logger.warning(e)
Expand Down
2 changes: 1 addition & 1 deletion tuf/repository_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -1997,7 +1997,7 @@ def create_tuf_client_directory(repository_directory, client_directory):

# If the client's metadata directory does not already exist, create it and
# any of its parent directories, otherwise raise an exception. An exception
# is raised to avoid accidentally overwritting previous metadata.
# is raised to avoid accidentally overwriting previous metadata.
try:
os.makedirs(client_metadata_directory)

Expand Down
2 changes: 1 addition & 1 deletion tuf/scripts/repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ def remove_verification_key(parsed_arguments):
# It is assumed remove_verification_key() only raises
# securesystemslib.exceptions.Error and
# securesystemslib.exceptions.FormatError, and the latter is not raised
# bacause a valid key should have been returned by
# because a valid key should have been returned by
# import_publickey_from_file().
except securesystemslib.exceptions.Error:
print(repr(keypath) + ' is not a trusted key. Skipping.')
Expand Down

0 comments on commit 9fde70f

Please sign in to comment.