[JENKINS-13270] always put P4TICKET into the environment

todo: add a separate option for P4TICKET, since some users may rightly consider the ticket as being sensitive information, and thus may want to disable it.
jenkinsci · Apr 3, 2012 · 16ef60d · 16ef60d
1 parent a252310
commit 16ef60d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/hudson/plugins/perforce/PerforceSCM.java b/src/main/java/hudson/plugins/perforce/PerforceSCM.java
@@ -431,15 +431,15 @@ public void buildEnvVars(AbstractBuild build, Map<String, String> env) {
         env.put("P4USER", p4User);
 
         // if we want to allow p4 commands in script steps this helps
-        if (exposeP4Passwd) {
-            // this may help when tickets are used since we are
-            // not storing the ticket on the client during login
-            if (p4Ticket != null) {
-                env.put("P4TICKET", p4Ticket);
-            }
+        if (exposeP4Passwd) {            
             PerforcePasswordEncryptor encryptor = new PerforcePasswordEncryptor();
             env.put("P4PASSWD", encryptor.decryptString(p4Passwd));
         }
+        // this may help when tickets are used since we are
+        // not storing the ticket on the client during login
+        if (p4Ticket != null) {
+            env.put("P4TICKET", p4Ticket);
+        }
 
         env.put("P4CLIENT", getEffectiveClientName(build));
         PerforceTagAction pta = build.getAction(PerforceTagAction.class);