openstack/deb-python-taskflow
Code Issues Proposed changes

Show file modifications and fix dirpath based on config file.

Browse Source 
Change-Id: Iad230d4d565ad9eab3f54f490aff1c1d1b308ab7
This commit is contained in:
Joshua Harlow
2013-07-24 15:45:20 -07:00
parent 611dfa0fb3
commit 7b72e46e51
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
update.py
View File

@@ -186,6 +186,7 @@ def _copy_file(path, dest, base, common_already=None):
for (i, line) in enumerate(lines): for (i, line) in enumerate(lines):
segments = _parse_import_line(line, i + 1, path) segments = _parse_import_line(line, i + 1, path)
if segments: if segments:
old_line = line
(comment, prefix, postfix, alias) = segments (comment, prefix, postfix, alias) = segments
line = 'from %s import %s' line = 'from %s import %s'
importing = _join_prefix_postfix(prefix, postfix) importing = _join_prefix_postfix(prefix, postfix)
@@ -202,8 +203,12 @@ def _copy_file(path, dest, base, common_already=None):
if comment: if comment:
line += ' #' + str(comment) line += ' #' + str(comment)
line += "\n" line += "\n"
if old_line != line:
print(" '%s' -> '%s'" % (old_line.strip(),
line.strip()))
f.write(line) f.write(line)
print("Fixing up %s" % (dest))
import_replace(dest) import_replace(dest)
_replace(dest, _replace(dest,
'possible_topdir, "taskflow",$', 'possible_topdir, "taskflow",$',
@@ -414,7 +419,7 @@ def main(argv):
dest_dir = conf.dest_dir dest_dir = conf.dest_dir
if not dest_dir and conf.config_file: if not dest_dir and conf.config_file:
dest_dir = os.path.dirname(conf.config_file[-1]) dest_dir = os.path.dirname(os.path.abspath(conf.config_file[-1]))
if not dest_dir or not os.path.isdir(dest_dir): if not dest_dir or not os.path.isdir(dest_dir):
print("A valid destination dir is required", file=sys.stderr) print("A valid destination dir is required", file=sys.stderr)