diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-04-11 16:18:01 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-04-11 16:18:01 -0700 |
| commit | e26b66cc6d48b6f98a941090f644807f4f14affb (patch) | |
| tree | 7b209f3880a9a86ff5720410e493c2519eb2f8c8 /indra/newview/viewer_manifest.py | |
| parent | 7de21de71f16ffe6ae9d7d72133b32041a4dfcac (diff) | |
MAINT-6928: revert previous post-move strategy, rename via self.path instead
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index d038392ba0..f6bbe7365a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -778,7 +778,7 @@ class DarwinManifest(ViewerManifest): relpkgdir = os.path.join(pkgdir, "lib", "release") debpkgdir = os.path.join(pkgdir, "lib", "debug") vmpdir = os.path.join(pkgdir, "VMP") - vmp266dir = os.path.join(vmpdir, "2.6") + vmp266dir = os.path.join(vmpdir, "python26") llbasedir = os.path.join(pkgdir, "llbase") requestsdir = os.path.join(pkgdir, "requests") @@ -791,7 +791,7 @@ class DarwinManifest(ViewerManifest): if self.prefix(dst="MacOS"): #apparently the codesign tool has a problem with dir names with dots in them - vmp266nodotdir = os.path.join(self.get_dst_prefix(), "python26") + """vmp266nodotdir = os.path.join(self.get_dst_prefix(), "python26")""" #this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322, SL-323 and MAINT-6928 self.path2basename(vmpdir,"SL_Launcher") self.path2basename(vmpdir,"*.py") @@ -813,21 +813,13 @@ class DarwinManifest(ViewerManifest): self.end_prefix() #these supplemental files are in case the user still has 2.6 as their default python #https://jira.secondlife.com/browse/MAINT-6928 - p266_path = os.path.join(self.get_dst_prefix(),'2.6') + p266_path = os.path.join(self.get_dst_prefix(),'python26') if not os.path.exists(p266_path): os.makedirs(p266_path) - if self.prefix(dst="2.6"): + if self.prefix("python26"): self.path2basename(vmp266dir,"*.py") self.end_prefix() - self.end_prefix() - if os.path.exists(p266_path): - try: - print "renaming python 2.6 directory %s to %s " % (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 + self.end_prefix() # most everything goes in the Resources directory if self.prefix(src="", dst="Resources"): |