rpms/monotone/devel monotone-0.47-netsync_over_pipe.patch, NONE, 1.1 import.log, 1.9, 1.10 monotone.spec, 1.53, 1.54

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/monotone/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29877/devel

Modified Files:
	import.log monotone.spec 
Added Files:
	monotone-0.47-netsync_over_pipe.patch 
Log Message:
Add patch from upstream fixing a regression for netsync over pipes.

monotone-0.47-netsync_over_pipe.patch:
 reactor.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE monotone-0.47-netsync_over_pipe.patch ---
--- network/reactor.cc	a90cee5442d3c77d8082d7bb91d4d23170bf25fb
+++ network/reactor.cc	3c94489a6e1ce701dbdcac568cb30e5e9e764342
@@ -87,9 +87,9 @@ void reactor::remove(shared_ptr<reactabl
   if (i != items.end())
     {
       items.erase(i);
-      have_pipe = false;
-      if (readying)
+      if (readying && !have_pipe)
         item->remove_from_probe(probe);
+      have_pipe = false;
     }
 }
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- import.log	11 Apr 2010 12:16:10 -0000	1.9
+++ import.log	8 May 2010 21:27:42 -0000	1.10
@@ -7,3 +7,4 @@ monotone-0_44-1_fc11:HEAD:monotone-0.44-
 monotone-0_45-1_fc11:HEAD:monotone-0.45-1.fc11.src.rpm:1252835264
 monotone-0_46-1_fc12:HEAD:monotone-0.46-1.fc12.src.rpm:1264284544
 monotone-0_47-1_fc12:HEAD:monotone-0.47-1.fc12.src.rpm:1270988125
+monotone-0_47-3_fc12:HEAD:monotone-0.47-3.fc12.src.rpm:1273353985


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- monotone.spec	29 Apr 2010 14:03:00 -0000	1.53
+++ monotone.spec	8 May 2010 21:27:43 -0000	1.54
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.47
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -11,6 +11,8 @@ Source0: http://monotone.ca/downloads/%{
 Source1: monotone.init
 Source2: monotone.sysconfig
 Source3: README.monotone-server
+# this is uppstream revision cb7a30cb..
+Patch0: monotone-0.47-netsync_over_pipe.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,13 +66,14 @@ and then pass commands to it.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %check
-make check %{?_smp_mflags} || { cat tester_dir/*.log; false; }
+make %{?_smp_mflags} check || { cat tester_dir/*.log; false; }
 
 %install
 rm -rf %{buildroot}
@@ -188,6 +191,10 @@ fi
 
 
 %changelog
+* Sat May  8 2010 Thomas Moschny <thomas.moschny at gmx.de> - 0.47-3
+- Add patch from upstream for a bug that prevents successful execution
+  of push / pull / sync over pipes.
+
 * Thu Apr 29 2010 Marcela Maslanova <mmaslano at redhat.com> - 0.47-2
 - Mass rebuild with perl-5.12.0