diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2017-04-11 12:57:09 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2017-04-11 12:57:09 -0700 |
commit | 7de21de71f16ffe6ae9d7d72133b32041a4dfcac (patch) | |
tree | 5ad8926625fc19daca4866c6158430cbc732a619 /indra | |
parent | e082edf5961ead47b39a317909a1b362fea8785f (diff) |
MAINT-6928: guard shutil.move against retry
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/viewer_manifest.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 9a084da1be..d038392ba0 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -823,7 +823,8 @@ class DarwinManifest(ViewerManifest): if os.path.exists(p266_path): try: print "renaming python 2.6 directory %s to %s " % (p266_path, vmp266nodotdir) - shutil.move(p266_path, vmp266nodotdir) + if not os.path.exists(vmp266nodotdir): + shutil.move(p266_path, vmp266nodotdir) except Exception, e: print "Failed to rename python 2.6 supplemental directory with error %s" % repr(e) raise |