From ef53ca613c29b8d13195cd662828962ac46b8435 Mon Sep 17 00:00:00 2001 From: vladdd Date: Tue, 26 Feb 2013 16:00:23 -0500 Subject: [PATCH] Fixed a bug in signercli.py where the absolute path of a directory was not properly set. Updated signerlib.py --- tuf/repo/signercli.py | 6 +----- tuf/repo/signerlib.py | 9 +++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/tuf/repo/signercli.py b/tuf/repo/signercli.py index 56bc504aa1..23f79058ce 100755 --- a/tuf/repo/signercli.py +++ b/tuf/repo/signercli.py @@ -895,11 +895,7 @@ def make_delegation(keystore_directory): delegated_targets_directory = _prompt(prompt, str) # Verify 'delegated_targets_directory'. - try: - tuf.repo.signerlib.check_directory(delegated_targets_directory) - except (tuf.FormatError, tuf.Error), e: - message = str(e)+'\n' - raise tuf.RepositoryError(message) + delegated_targets_directory = _check_directory(delegated_targets_directory) # Get all the target roles and their respective keyids. # These keyids will let the user know which roles are currently known. diff --git a/tuf/repo/signerlib.py b/tuf/repo/signerlib.py index c710c4be45..445523505b 100755 --- a/tuf/repo/signerlib.py +++ b/tuf/repo/signerlib.py @@ -721,7 +721,7 @@ def check_directory(directory): directory: - The directory (absolute path) to check. + The directory to check. tuf.Error, if 'directory' could not be validated. @@ -740,15 +740,12 @@ def check_directory(directory): # Raise 'tuf.FormatError' if there is a mismatch. tuf.formats.PATH_SCHEMA.check_match(directory) - directory = os.path.abspath(directory) - - if not os.path.isabs(directory): - raise tuf.Error(repr(directory)+' is not an absolute path.') - # Check if the directory exists. if not os.path.isdir(directory): raise tuf.Error(repr(directory)+' directory does not exist') + directory = os.path.abspath(directory) + return directory