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:19:22
Branch: HEAD Handle: 2002112110192200
Modified files:
openpkg-re openpkg-build openpkg-dev
Log:
conflict search again returns a target instead of boolean
Summary:
Revision Changes Path
1.42 +7 -4 openpkg-re/openpkg-build
1.40 +10 -7 openpkg-re/openpkg-dev
____________________________________________________________________________
Index: openpkg-re/openpkg-build
============================================================
$ cvs diff -u -r1.41 -r1.42 openpkg-build
--- openpkg-re/openpkg-build 21 Nov 2002 10:11:03 -0000 1.41
+++ openpkg-re/openpkg-build 21 Nov 2002 10:19:22 -0000 1.42
@@ -635,12 +635,14 @@
#
sub target_conflicts ($$) {
my($target, $map) = @_;
+ my($t);
foreach (@{$target->{conflicts}}) {
- return 1 if find_target($_, $map);
+ $t = find_target($_, $map);
+ return $t if $t;
}
- return 0;
+ return;
}
#
@@ -792,8 +794,7 @@
#
# see if a target is already installed and requires a rebuild
#
- $t = find_target($target->{name}, $env->{installed});
- if ($t) {
+ if ($t = find_target($target->{name}, $env->{installed})) {
if (exists $env->{exclude}->{$target->{name}}) {
print "# excluding $target->{name} (no upgrade allowed)\n";
return;
@@ -815,6 +816,8 @@
override_options($target->{OPTIONS}, $t->{OPTIONS});
$target->{REBUILD} = 1;
}
+
+print "FOO1\n";
if (exists $env->{exclude}->{$target->{name}}) {
die "FATAL: target ".vsn($target)." is forbidden\n";
Index: openpkg-re/openpkg-dev
============================================================
$ cvs diff -u -r1.39 -r1.40 openpkg-dev
--- openpkg-re/openpkg-dev 4 Nov 2002 16:16:58 -0000 1.39
+++ openpkg-re/openpkg-dev 21 Nov 2002 10:19:22 -0000 1.40
@@ -50,11 +50,13 @@
#OPENPKG_MODE=developer # developer
#[EMAIL PROTECTED]:/e/openpkg/cvs # developer
#OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/current/SRC/ # developer
-export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO OPENPKG_DIST
+OPENPKG_REV=
+export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_DIST OPENPKG_REV
-# override configuration from ${HOME}/.openpkg-dev.rc
-if [ -f ${HOME}/.openpkg-dev.rc ]; then
- . ${HOME}/.openpkg-dev.rc
+# override configuration from ${HOME}/.openpkg-dev*.rc
+progname=`basename $0`
+if [ -f ${HOME}/.$progname.rc ]; then
+ . ${HOME}/.$progname.rc
fi
# override configuration from command line
@@ -203,9 +205,10 @@
( cd ${OPENPKG_WORK}
HOME=${OPENPKG_WORK}
export HOME
- cvs -q -d ${OPENPKG_REPO} checkout openpkg-dev
- mv openpkg-dev/* .
- rmdir openpkg-dev
+ cvs -q -d ${OPENPKG_REPO} checkout openpkg-dev-web openpkg-dev-doc
openpkg-dev-re openpkg-dev-adm
+ cvs -q -d ${OPENPKG_REPO} checkout ${OPENPKG_REV} openpkg-dev-src
+ # mv openpkg-dev/* .
+ # rmdir openpkg-dev
)
echo "++ creating README file (${OPENPKG_REPO}/00README)"
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
