x/python-ganttclient
Code Issues Proposed changes

move the images_dir out of the way when converting

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-03-07 21:30:20 +00:00
parent 0357f0601a
commit 6b14922f34
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/nova-manage
View File

@@ -846,6 +846,16 @@ class ImageCommands(object):
arguments: directory""" arguments: directory"""
machine_images = {} machine_images = {}
other_images = {} other_images = {}
directory = os.path.abspath(directory)
# NOTE(vish): If we're importing from the images path dir, attempt
# to move the files out of the way before importing
# so we aren't writing to the same directory. This
# may fail if the dir was a mointpoint.
if directory == os.path.abspath(FLAGS.images_path):
new_dir = "%s_bak" % directory
os.move(directory, new_dir)
os.mkdir(directory)
directory = new_dir
for fn in glob.glob("%s/*/info.json" % directory): for fn in glob.glob("%s/*/info.json" % directory):
try: try:
image_path = os.path.join(fn.rpartition('/')[0], 'image') image_path = os.path.join(fn.rpartition('/')[0], 'image')