OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 21-Nov-2002 11:36:27
Branch: HEAD Handle: 2002112110362700
Modified files:
openpkg-re openpkg-build
Log:
Ralf's colons
Summary:
Revision Changes Path
1.44 +8 -7 openpkg-re/openpkg-build
____________________________________________________________________________
Index: openpkg-re/openpkg-build
============================================================
$ cvs diff -u -r1.43 -r1.44 openpkg-build
--- openpkg-re/openpkg-build 21 Nov 2002 10:24:18 -0000 1.43
+++ openpkg-re/openpkg-build 21 Nov 2002 10:36:27 -0000 1.44
@@ -817,8 +817,6 @@
$target->{REBUILD} = 1;
}
-print "FOO1\n";
-
if (exists $env->{exclude}->{$target->{name}}) {
die "FATAL: target ".vsn($target)." is forbidden\n";
}
@@ -1035,7 +1033,7 @@
$url .= '/' unless $url =~ m{/$}s;
- $mark = "++".uc($PROG)."++".$$;
+ $mark = '::::';
foreach (@$list) {
$spkg = $_->{href};
@@ -1066,12 +1064,15 @@
$cmd2 = "$RPM_PRIV$opt -Uvh $bpkg";
if ($ignore) {
- $cmd2 = "$cmd1 && $cmd2" if defined $cmd1;
+ $cmd2 = "$cmd1 && \\\n$cmd2" if defined $cmd1;
} else {
- $cmd2 = "( $cmd1 && $cmd2 )" if defined $cmd1;
- $cmd2 = "$cmd2 || exit 1";
+ if (defined $cmd1) {
+ $cmd2 = "$cmd1 || exit \$?\n$cmd2 || exit \$?"
+ } else {
+ $cmd2 = "$cmd2 || exit \$?";
+ }
}
- print "echo $mark BEGIN $spkg\n$cmd2\necho $mark END $spkg = \$?\n";
+ print "echo $mark $spkg $mark\n$cmd2\necho $mark $spkg = \$? $mark\n";
}
}
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
