Move the fixed #flush implementation to an extension loaded only on P…

…haro < 12 versions
ba-st · Aug 12, 2024 · baf3971 · baf3971
1 parent eca1148
commit baf3971
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/...e-Protocol-Core/AmqpSocketStream.class.st → ...Pending-Patches/SocketStream.extension.st b/...e-Protocol-Core/AmqpSocketStream.class.st → ...Pending-Patches/SocketStream.extension.st
@@ -1,12 +1,7 @@
-Class {
-	#name : 'AmqpSocketStream',
-	#superclass : 'SocketStream',
-	#category : 'Ansible-Protocol-Core',
-	#package : 'Ansible-Protocol-Core'
-}
+Extension { #name : 'SocketStream' }
 
-{ #category : 'control' }
-AmqpSocketStream >> flush [
+{ #category : '*Ansible-Pharo-Pending-Patches' }
+SocketStream >> flush [
 	"If the other end is connected and we have something
 	to send, then we send it and reset the outBuffer.
 	If the other end is closed and we are signaling errors, do so."

diff --git a/source/Ansible-Pharo-Pending-Patches/package.st b/source/Ansible-Pharo-Pending-Patches/package.st
@@ -0,0 +1 @@
+Package { #name : 'Ansible-Pharo-Pending-Patches' }
diff --git a/source/Ansible-Protocol-Core/AmqpConnection.class.st b/source/Ansible-Protocol-Core/AmqpConnection.class.st
@@ -268,18 +268,20 @@ AmqpConnection >> nextFrame [
 { #category : 'opening' }
 AmqpConnection >> open [
 
-  codec := AmqpCodec on: ( ( AmqpSocketStream on: socket )
-                 noTimeout;
-                 binary;
-                 yourself ).
+	codec := AmqpCodec
+		on:
+			((SocketStream on: socket)
+				noTimeout;
+				binary;
+				yourself).
 
-  self
-    sendProtocolHeader;
-    startConnection;
-    tuneConnection;
-    openConnection.
+	self
+		sendProtocolHeader;
+		startConnection;
+		tuneConnection;
+		openConnection.
 
-  heartbeatSender startBeatingEvery: parameters heartbeat
+	heartbeatSender startBeatingEvery: parameters heartbeat
 ]
 
 { #category : 'private-opening' }

diff --git a/source/BaselineOfAnsible/BaselineOfAnsible.class.st b/source/BaselineOfAnsible/BaselineOfAnsible.class.st
@@ -55,7 +55,13 @@ BaselineOfAnsible >> setUpDependencies: spec [
 
 { #category : 'baselines' }
 BaselineOfAnsible >> setUpDeploymentPackages: spec [
-
+
+	spec
+		for: #('pharo7.x' 'pharo8.x' 'pharo9.x' 'pharo10.x' 'pharo11.x')
+		do: [ spec
+				package: 'Ansible-Pharo-Pending-Patches';
+				group: 'RabbitMQ' with: 'Ansible-Pharo-Pending-Patches' ].
+
 	spec
 		package: 'Ansible-Protocol-Core';
 		group: 'Deployment-08' with: 'Ansible-Protocol-Core';