OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Jan-2004 16:16:59
Branch: HEAD Handle: 2004011615165900
Modified files:
openpkg-src/shiela shiela.patch
Log:
remove usage of -l option which was removed in CVS 1.12.1 recently
Summary:
Revision Changes Path
1.3 +101 -0 openpkg-src/shiela/shiela.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/shiela/shiela.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 shiela.patch
--- openpkg-src/shiela/shiela.patch 16 Jan 2004 12:14:12 -0000 1.2
+++ openpkg-src/shiela/shiela.patch 16 Jan 2004 15:16:59 -0000 1.3
@@ -19,3 +19,104 @@
;;
* )
echo "ERROR: CVS has to be at least version 1.10.7"
+Index: shiela.pl
+--- shiela.pl 23 Dec 2002 14:45:16 -0000 1.50
++++ shiela.pl 16 Jan 2004 15:15:37 -0000
+@@ -580,7 +580,7 @@
+ STDERR->flush; # because of fork() behind open2()!
+ $cvs->{rfd} = new IO::Handle;
+ $cvs->{wfd} = new IO::Handle;
+- $cvs->{pid} = IPC::Open2::open2($cvs->{rfd}, $cvs->{wfd}, "$program -Q -l -n
server")
++ $cvs->{pid} = IPC::Open2::open2($cvs->{rfd}, $cvs->{wfd}, "$program -f -Q -n
server")
+ || die "cannot spawn CVS server process `$program server'";
+ print STDERR "cvs server: spawned (pid $cvs->{pid})\n" if ($trace);
+ bless ($cvs, $class);
+@@ -1248,14 +1248,14 @@
+ # annotate the files with the branch they stay on
+ my $cvsstat = '';
+ if (not $RT->{useserver}) {
+- my $io = new IO::File "$RT->{cvs} -f -l -Q -n status ".join(' ',
@cvsfiles)."|"
++ my $io = new IO::File "$RT->{cvs} -f -Q -n status ".join(' ',
@cvsfiles)."|"
+ || die "unable to open CVS command pipe for reading";
+ $cvsstat .= $_ while (<$io>);
+ $io->close;
+ }
+ else {
+ my $cvs = new CVS ($RT->{cvs}, $RT->{cvsroot});
+- $cvs->global_options("-l", "-Q", "-n");
++ $cvs->global_options("-Q", "-n");
+ $cvs->directory($cvsdir);
+ foreach my $cvsfile (@cvsfiles) {
+ $cvs->entry($cvsfile);
+@@ -1488,7 +1488,7 @@
+ print STDERR "cvs import: Ignoring this operation - don't
expect log messages!\n";
+ exit(0);
+ }
+- my $io = new IO::File "$RT->{cvs} -f -l -Q -n log -r$It '$Is'|"
++ my $io = new IO::File "$RT->{cvs} -f -Q -n log -r$It '$Is'|"
+ || die "unable to open CVS command pipe for reading";
+ $rcslog = $_ while (<$io>);
+ $io->close;
+@@ -1610,7 +1610,7 @@
+ if ($Io eq 'R' and $Iv eq 'NONE') {
+ my $rcslog ='';
+ if (not $RT->{useserver}) {
+- my $io = new IO::File "$RT->{cvs} -f -l -Q -n log '$Is'|"
++ my $io = new IO::File "$RT->{cvs} -f -Q -n log '$Is'|"
+ || die "unable to open CVS command pipe for reading";
+ $rcslog .= $_ while (<$io>);
+ $io->close;
+@@ -1633,7 +1633,7 @@
+ my $rcslog = '';
+ if ($Io eq 'A' or $Io eq 'M' or $Io eq 'R') {
+ if (not $RT->{useserver}) {
+- my $io = new IO::File "$RT->{cvs} -f -l -Q -n log -r$Iv '$Is'|"
++ my $io = new IO::File "$RT->{cvs} -f -Q -n log -r$Iv '$Is'|"
+ || die "unable to open CVS command pipe for reading";
+ $rcslog .= $_ while (<$io>);
+ $io->close;
+@@ -1669,7 +1669,7 @@
+ }
+ else {
+ if ($Io eq 'A') {
+- my $io = new IO::File "<$Is" || die "unable open $Is for reading";
++ my $io = new IO::File "<$Is" || die "unable to open $Is for
reading";
+ my $l = 0;
+ $l++ while (<$io>);
+ $io->close;
+@@ -1706,7 +1706,7 @@
+ my $io = new IO::File ">$RT->{tmpfile}.all"
+ || die "unable to open temporary file $RT->{tmpfile}.all for
writing";
+ if (not $RT->{useserver}) {
+- my $cvs = new IO::File "$RT->{cvs} -f -l -Q -n update -p -r$Iv
'$Is'|"
++ my $cvs = new IO::File "$RT->{cvs} -f -Q -n update -p -r$Iv '$Is'|"
+ || die "unable to open CVS command pipe for reading";
+ $io->print($_) while (<$cvs>);
+ $cvs->close;
+@@ -1789,7 +1789,7 @@
+ my $io = new IO::File ">$RT->{tmpfile}.old"
+ || die "unable to open temporary file $RT->{tmpfile}.old
for writing";
+ if (not $RT->{useserver}) {
+- my $cvs = new IO::File "$RT->{cvs} -f -l -Q -n update -p
-r$IV '$Is'|"
++ my $cvs = new IO::File "$RT->{cvs} -f -Q -n update -p
-r$IV '$Is'|"
+ || die "unable to open CVS command pipe for reading";
+ $io->print($_) while (<$cvs>);
+ $cvs->close;
+@@ -1810,7 +1810,7 @@
+ $io = new IO::File ">$RT->{tmpfile}.new"
+ || die "unable to open temporary file $RT->{tmpfile}.new
for writing";
+ if (not $RT->{useserver}) {
+- my $cvs = new IO::File "$RT->{cvs} -f -l -Q -n update -p
-r$Iv '$Is'|"
++ my $cvs = new IO::File "$RT->{cvs} -f -Q -n update -p
-r$Iv '$Is'|"
+ || die "unable to open CVS command pipe for reading";
+ $io->print($_) while (<$cvs>);
+ $cvs->close;
+@@ -1856,7 +1856,7 @@
+ # generate textual change patch script
+ my $d = '';
+ if (not $RT->{useserver}) {
+- my $io = new IO::File "$RT->{cvs} -f -l -Q -n diff -u -r$IV
-r$Iv '$Is'|"
++ my $io = new IO::File "$RT->{cvs} -f -Q -n diff -u -r$IV -r$Iv
'$Is'|"
+ || die "unable to open CVS command pipe for reading";
+ $d .= $_ while (<$io>);
+ $io->close;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
