OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Oct-2005 13:10:14
Branch: HEAD Handle: 2005100712101301
Modified files:
openpkg-src/cvs cvs.patch.rse cvs.spec
Log:
one more subtle bug in my RSE patches, caused by the recent massive
changes to CVS internals
Summary:
Revision Changes Path
1.24 +2 -2 openpkg-src/cvs/cvs.patch.rse
1.106 +1 -1 openpkg-src/cvs/cvs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.patch.rse
============================================================================
$ cvs diff -u -r1.23 -r1.24 cvs.patch.rse
--- openpkg-src/cvs/cvs.patch.rse 6 Oct 2005 06:52:37 -0000 1.23
+++ openpkg-src/cvs/cvs.patch.rse 7 Oct 2005 11:10:13 -0000 1.24
@@ -1439,7 +1439,7 @@
retrieving revision 1.1.1.19
diff -u -d -r1.1.1.19 main.c
--- src/main.c 2 Oct 2005 15:17:21 -0000 1.1.1.19
-+++ src/main.c 6 Oct 2005 06:49:24 -0000
++++ src/main.c 7 Oct 2005 11:08:15 -0000
@@ -28,6 +28,10 @@
const char *program_path;
const char *cvs_cmd_name;
@@ -2076,7 +2076,7 @@
read_cvsrc and other such places or vice versa. That sort
of thing probably needs more thought. */
+#if defined(RSE_PATCH_CVSROOT) || defined(RSE_PATCH_CUSTOMCMD)
-+ if (!server_active && !current_parsed_root->isremote &&
!standalone_command)
++ if (!server_active && !standalone_command &&
!current_parsed_root->isremote)
+#else
if (!server_active && !current_parsed_root->isremote)
+#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.spec
============================================================================
$ cvs diff -u -r1.105 -r1.106 cvs.spec
--- openpkg-src/cvs/cvs.spec 6 Oct 2005 06:52:38 -0000 1.105
+++ openpkg-src/cvs/cvs.spec 7 Oct 2005 11:10:14 -0000 1.106
@@ -37,7 +37,7 @@
Group: SCM
License: GPL
Version: %{V_cvs}
-Release: 20051006
+Release: 20051007
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
