OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 17-Feb-2005 15:50:30
Branch: HEAD Handle: 2005021714503000
Modified files:
openpkg-tools/cmd src2make.pl
Log:
check whether a valid and non-empty RPM has been build; return status
of build (not rm)
Summary:
Revision Changes Path
1.11 +2 -2 openpkg-tools/cmd/src2make.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/src2make.pl
============================================================================
$ cvs diff -u -r1.10 -r1.11 src2make.pl
--- openpkg-tools/cmd/src2make.pl 15 Feb 2005 15:25:48 -0000 1.10
+++ openpkg-tools/cmd/src2make.pl 17 Feb 2005 14:50:30 -0000 1.11
@@ -732,9 +732,9 @@
"\$(RPM_RD) --rebuild $pkg.src.rpm 2>&1; " .
"echo \"Build End: \`date\`\") | " .
"tee \$(LOG)/$pkg.log.\$(HOSTNAME).\$(PLATFORM)\n";
- $MF .= "\t-color=\"red\"; [ -f \$(DST)/$pkg.\$(PLATFORM).rpm ] &&
color=\"green\"; " .
+ $MF .= "\t-color=\"red\"; dst=\$(DST)/$pkg.\$(PLATFORM).rpm; if [ -f
\$\$dst ]; then \$(RPM_RD) --checksig \$\$dst; if [ \$\$? -ne 0 ]; then rm
\$\$dst; else color=\"green\"; fi; fi; " .
"\$(EXEC_BFDB) -i \$(HOSTNAME)-\$(PLATFORM) -p $pkg -c \$\$color
end; " .
- "[ \$\$color = \"red\" ] && rm $pkg.src.rpm\n";
+ "[ \$\$color = \"red\" ] && rm $pkg.src.rpm; [ \$\$color =
\"green\" ]\n";
# generate build epilog (installation of dependencies)
if (not $nouninstall) {
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
