[JENKINS-28367] fallback on 'p4 login -p' when '-a' fails

jenkinsci · May 14, 2015 · 55762a9 · 55762a9 · ybdesire · May 22, 2015
1 parent a8e1f72
commit 55762a9
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/com/tek42/perforce/parse/AbstractPerforceTemplate.java b/src/main/java/com/tek42/perforce/parse/AbstractPerforceTemplate.java
@@ -616,8 +616,16 @@ protected void login() throws PerforceException {
      * @throws PerforceException if the execution of the p4Exe fails
      */
     private String p4Login(String p4Exe) throws IOException, PerforceException {
+        try {
+            return p4Login(new String[] { p4Exe, "login", "-a", "-p" });
+        } catch (PerforceException e) {
+            return p4Login(new String[] { p4Exe, "login", "-p" });
+        }
+    }
+
+    private String p4Login(String[] p4Cmd) throws IOException, PerforceException {
         Executor login = depot.getExecFactory().newExecutor();
-        login.exec(new String[] { p4Exe, "login", "-a", "-p" });
+        login.exec(p4Cmd);
 
         try {
             // "echo" the password for the p4 process to read