opendev/storyboard
Code Issues Proposed changes

Fixed bug in working directories.

Browse Source 
The patch that was merged for working path directories included three
bugs: Firstly, the use of ListOpt for the working_directory
configuration. Secondly, it did not properly expand '~' user
references, and instead treated them as actual file paths. Thankfully
this feature is not yet in use, so there should not be any files that
need to be cleaned up on production. Lastly, the working dir was
never set on subsequent runs, as the assignment was blocked in an if
statement.

Change-Id: I112d054d8cb9e76ad38ef3c2b36ca700804238df
This commit is contained in:
Michael Krotscheck 2014-11-25 12:33:47 -08:00
parent ed58fd8670
commit d5116cf4e2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
storyboard/common/working_dir.py
View File

@ -23,9 +23,9 @@ LOG = log.getLogger(__name__)
CONF = cfg.CONF
CONF.register_opts([
cfg.ListOpt('working_directory',
default='~/.storyboard',
help='The root path to storyboard\'s working directory.')
cfg.StrOpt('working_directory',
default='~/.storyboard',
help='The root path to storyboard\'s working directory.')
])
WORKING_DIRECTORY = None
@ -39,7 +39,14 @@ def get_working_directory():
if not WORKING_DIRECTORY:
# Try to resolve the configured directory.
conf_path = os.path.realpath(CONF.working_directory)
conf_path = CONF.working_directory
# Expand any users. This is a noop if no ~ references are
# found.
conf_path = os.path.expanduser(conf_path)
# Expand backlinks and references
conf_path = os.path.realpath(conf_path)
if not os.path.exists(conf_path):
try:
@ -59,8 +66,8 @@ def get_working_directory():
% (conf_path,))
exit(1)
# We've passed all our checks, let's save our working directory.
WORKING_DIRECTORY = conf_path
# We've passed all our checks, let's save our working directory.
WORKING_DIRECTORY = conf_path
return WORKING_DIRECTORY