From 8d7c887d3b624a414f6588e42e0ff3d48d7dd495 Mon Sep 17 00:00:00 2001 From: Matt Wobensmith Date: Thu, 9 May 2019 20:55:39 -0700 Subject: [PATCH] Do not rename .iris2 folder, just leave it --- src/__main__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/__main__.py b/src/__main__.py index 596a7d1f..f8334480 100644 --- a/src/__main__.py +++ b/src/__main__.py @@ -206,11 +206,9 @@ def migrate_data(): if os.path.exists(iris_1_install): os.rename(os.path.join(os.path.expanduser('~'), '.iris'), os.path.join(os.path.expanduser('~'), '.iris_old')) - iris_2_install = os.path.join(os.path.expanduser('~'), '.iris2') - logger.debug('Old Iris 2 install exists: %s' % os.path.exists(iris_2_install)) - - if os.path.exists(iris_2_install): - os.rename(os.path.join(os.path.expanduser('~'), '.iris2'), os.path.join(os.path.expanduser('~'), '.iris')) + # TBD: what to do with previous Iris 2.0 folder + old_iris_2_install = os.path.join(os.path.expanduser('~'), '.iris2') + logger.debug('Old Iris 2 install exists: %s' % os.path.exists(old_iris_2_install)) class ShutdownTasks(CleanUp):