diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-01-19 10:35:17 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-01-19 10:35:17 -0500 |
| commit | d95d80212c971d424e8b11f920af1d43b3b59758 (patch) | |
| tree | fb08d899bc11abb1d047531d315d0e81d404edc8 /indra/newview | |
| parent | 1efff804b4daa5ca3160a7e4509629e78d3964b7 (diff) | |
| parent | c157db954a4d90a508eadff36d805dc5f28f7ee9 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-tools-update
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 954e454080..666823e583 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -38,7 +38,7 @@ viewer_dir = os.path.dirname(__file__) # Put it FIRST because some of our build hosts have an ancient install of # indra.util.llmanifest under their system Python! sys.path.insert(0, os.path.join(viewer_dir, os.pardir, "lib", "python")) -from indra.util.llmanifest import LLManifest, main, proper_windows_path, path_ancestors, CHANNEL_VENDOR_BASE, RELEASE_CHANNEL, ManifestError +from indra.util.llmanifest import LLManifest, main, path_ancestors, CHANNEL_VENDOR_BASE, RELEASE_CHANNEL, ManifestError try: from llbase import llsd except ImportError: @@ -582,7 +582,7 @@ class Windows_i686_Manifest(ViewerManifest): while (not installer_created) and (nsis_attempts > 0): try: nsis_attempts-=1; - self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile)) + self.run_command('"' + NSIS_path + '" ' + self.dst_path_of(tempfile)) installer_created=True # if no exception was raised, the codesign worked except ManifestError, err: if nsis_attempts: |