OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 09-Aug-2002 18:03:29
Branch: HEAD Handle: 2002080917032900
Modified files:
openpkg-re src2make.pl
Log:
fix introduced --defines, shutdown messages from ssh
Summary:
Revision Changes Path
1.37 +3 -2 openpkg-re/src2make.pl
____________________________________________________________________________
Index: openpkg-re/src2make.pl
============================================================
$ cvs diff -u -r1.36 -r1.37 src2make.pl
--- openpkg-re/src2make.pl 9 Aug 2002 14:56:36 -0000 1.36
+++ openpkg-re/src2make.pl 9 Aug 2002 16:03:29 -0000 1.37
@@ -211,7 +211,8 @@
}
$q = "[M-PreReq:<%{REQUIRENAME} %|REQUIREFLAGS?{%{REQUIREFLAGS:depflags}
%{REQUIREVERSION}}:{}|>\n]";
$q .= "[M-Provides:<%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags}
%{PROVIDEVERSION}}:{}|>\n]";
- $o = `cd $tmpdir && $prefix/bin/rpm -q --qf "$q" --define "_sourcedir `pwd`"
--define '_specdir `pwd`' --specfile $srcrpm_name.spec`;
+ my $pwd = `pwd`;
+ $o = `cd $tmpdir && $prefix/bin/rpm -q --qf "$q" --define "_sourcedir $pwd"
--define '_specdir $pwd' --specfile $srcrpm_name.spec`;
$o =~ s|M-PreReq:<rpmlib\(.*?\).*?>\n||gs;
$r = &parseresponse($o);
my $pkg_ireq = $r->{PreReq};
@@ -683,7 +684,7 @@
"\n" .
"# configuration: user/root command execution\n" .
"EXEC_HOST = localhost\n" .
- "EXEC_ROOT = ssh root\@\$(EXEC_HOST) cd \$\$PWD \\&\\&\n" .
+ "EXEC_ROOT = ssh -t -x -q root\@\$(EXEC_HOST) cd \$\$PWD \\&\\&\n" .
"EXEC_USER = \n" .
"\n" .
"# configuration: command execution environment\n" .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]