changed variable names and errors to more accurately reflect the operation being performed

indra/newview/viewer_manifest.py

@@ -622,21 +622,21 @@ def package_finish(self):
         NSIS_path = os.path.expandvars('${ProgramFiles}\\NSIS\\Unicode\\makensis.exe')
         if not os.path.exists(NSIS_path):
             NSIS_path = os.path.expandvars('${ProgramFiles(x86)}\\NSIS\\Unicode\\makensis.exe')
-        signed=False
-        sign_attempts=3
-        sign_retry_wait=15
-        while (not signed) and (sign_attempts > 0):
+        installer_created=False
+        nsis_attempts=3
+        nsis_retry_wait=15
+        while (not installer_created) and (nsis_attempts > 0):
             try:
-                sign_attempts-=1;
+                nsis_attempts-=1;
                 self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
-                signed=True # if no exception was raised, the codesign worked
+                installer_created=True # if no exception was raised, the codesign worked
             except ManifestError, err:
-                if sign_attempts:
-                    print >> sys.stderr, "codesign failed, waiting %d seconds before retrying" % sign_retry_wait
-                    time.sleep(sign_retry_wait)
-                    sign_retry_wait*=2
+                if nsis_attempts:
+                    print >> sys.stderr, "nsis failed, waiting %d seconds before retrying" % nsis_retry_wait
+                    time.sleep(nsis_retry_wait)
+                    nsis_retry_wait*=2
                 else:
-                    print >> sys.stderr, "Maximum codesign attempts exceeded; giving up"
+                    print >> sys.stderr, "Maximum nsis attempts exceeded; giving up"
                     raise
         # self.remove(self.dst_path_of(tempfile))
         # If we're on a build machine, sign the code using our Authenticode certificate. JC