client_reset-2016.1.patch #1

  • //
  • guest/
  • jason_leonard/
  • swarm/
  • library/
  • client_reset-2016.1.patch
  • View
  • Commits
  • Open Download .zip Download (906 B)
diff -rupN library.orig/P4/ClientPool/ClientPool.php library/P4/ClientPool/ClientPool.php
--- library.orig/P4/ClientPool/ClientPool.php	2016-07-27 09:34:48.000000000 +0000
+++ library/P4/ClientPool/ClientPool.php	2016-07-27 09:36:23.000000000 +0000
@@ -281,6 +281,9 @@ class ClientPool extends ConnectedAbstra
             }
         }
 
+        // clear files if needed
+        if ($clearFiles) { $this->clearFiles($p4); }
+
         // force the client to have current/correct settings
         $data = $p4->run('client', array('-o', $client))->expandSequences()->getData(-1);
         $p4->run(
@@ -297,8 +300,7 @@ class ClientPool extends ConnectedAbstra
         // ensure the root folder and lock file exist
         is_dir($root) ?: mkdir($root);
 
-        // clear files if needed and return
-        return $clearFiles ? $this->clearFiles($p4) : $this;
+        return $this;
     }
 
     /**
# Change User Description Committed
#1 19977 jason_leonard Adding latest patches for Swarm 2016.1

Adding: Client reset patch for ClientPool to prevent exception with dirty client.
Adding: Lock review update patch for preventing a race condition whilst Swarm updates or creates a review.
Adding: Workers no tasks log patch for removing a "no tasks in queue" message whilst capturing debug logs.
Updating: moderators email patch for allowing moderators to receive review change emails.
Updating: projects caseinsensivie matching patch to workaround P4PHP case sensitivity issues when selecting a change's project.