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: 06-Oct-2005 08:52:38
Branch: HEAD Handle: 2005100607523701
Modified files:
openpkg-src/cvs cvs.patch.rse cvs.spec
Log:
fix expand_path usage (arguments were re-ordered between 1.12.12 and
1.12.13 ;-)
Summary:
Revision Changes Path
1.23 +6 -6 openpkg-src/cvs/cvs.patch.rse
1.105 +1 -1 openpkg-src/cvs/cvs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.patch.rse
============================================================================
$ cvs diff -u -r1.22 -r1.23 cvs.patch.rse
--- openpkg-src/cvs/cvs.patch.rse 5 Oct 2005 18:08:30 -0000 1.22
+++ openpkg-src/cvs/cvs.patch.rse 6 Oct 2005 06:52:37 -0000 1.23
@@ -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 5 Oct 2005 11:10:32 -0000
++++ src/main.c 6 Oct 2005 06:49:24 -0000
@@ -28,6 +28,10 @@
const char *program_path;
const char *cvs_cmd_name;
@@ -1511,7 +1511,7 @@
+ }
+
+ /* execute the command */
-+ cmd = expand_path(argv[0], current_parsed_root &&
current_parsed_root->directory ? current_parsed_root->directory : "/",
cvs_cmd_name, 0, 0);
++ cmd = expand_path(argv[0], current_parsed_root &&
current_parsed_root->directory ? current_parsed_root->directory : "/", false,
cvs_cmd_name, 0);
+ run_setup(cmd);
+ for (i = 1; i < argc; i++)
+ run_add_arg(argv[i]);
@@ -2090,7 +2090,7 @@
+#ifdef RSE_PATCH_PROLOGEPILOG
+ if (cvs_prolog != NULL) {
+ char *cmd;
-+ cmd = expand_path(cvs_prolog, current_parsed_root &&
current_parsed_root->directory ? current_parsed_root->directory : "/",
"prolog", 0, 0);
++ cmd = expand_path(cvs_prolog, current_parsed_root &&
current_parsed_root->directory ? current_parsed_root->directory : "/", false,
"prolog", 0);
+ run_setup(cmd);
+ run_add_arg("prolog");
+ run_add_arg(cvs_cmd_name);
@@ -2133,7 +2133,7 @@
+#ifdef RSE_PATCH_PROLOGEPILOG
+ if (cvs_epilog != NULL) {
+ char *cmd;
-+ cmd = expand_path(cvs_epilog, current_parsed_root &&
current_parsed_root->directory ? current_parsed_root->directory : "/",
"epilog", 0, 0);
++ cmd = expand_path(cvs_epilog, current_parsed_root &&
current_parsed_root->directory ? current_parsed_root->directory : "/", false,
"epilog", 0);
+ run_setup(cmd);
+ run_add_arg("epilog");
+ run_add_arg(cvs_cmd_name);
@@ -2304,7 +2304,7 @@
retrieving revision 1.1.1.17
diff -u -d -r1.1.1.17 root.c
--- src/root.c 25 Sep 2005 00:38:29 -0000 1.1.1.17
-+++ src/root.c 5 Oct 2005 11:11:05 -0000
++++ src/root.c 6 Oct 2005 06:49:44 -0000
@@ -122,6 +122,9 @@
goto out;
}
@@ -2652,7 +2652,7 @@
+ fprintf(stderr, "%s: synchronizing SLAVE with MASTER of
repository `%s':\n", program_name, e->nickname);
+ fprintf(stderr, "%s: %s --> %s (%s)\n", program_name,
e->masterpath, e->slavepath, e->syncprog);
+ }
-+ cmd = expand_path(syncprog, current_parsed_root &&
current_parsed_root->directory ? current_parsed_root->directory : "/", "sync",
0, 0);
++ cmd = expand_path(syncprog, current_parsed_root &&
current_parsed_root->directory ? current_parsed_root->directory : "/", false,
"sync", 0);
+ run_setup(cmd);
+ run_add_arg(e->nickname);
+ run_add_arg(e->masterpath);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.spec
============================================================================
$ cvs diff -u -r1.104 -r1.105 cvs.spec
--- openpkg-src/cvs/cvs.spec 5 Oct 2005 18:08:30 -0000 1.104
+++ openpkg-src/cvs/cvs.spec 6 Oct 2005 06:52:38 -0000 1.105
@@ -37,7 +37,7 @@
Group: SCM
License: GPL
Version: %{V_cvs}
-Release: 20051005
+Release: 20051006
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
