OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 12-Feb-2003 11:10:24
Branch: HEAD Handle: 2003021210102201
Modified files:
openpkg-src/openpkg-tool
openpkg-index.pl openpkg-tool.spec
openpkg-web news.txt
Log:
gracefully handle undefined condition variables, keep index syntax
correct
Summary:
Revision Changes Path
1.15 +11 -3 openpkg-src/openpkg-tool/openpkg-index.pl
1.36 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec
1.3276 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-index.pl
============================================================================
$ cvs diff -u -r1.14 -r1.15 openpkg-index.pl
--- openpkg-src/openpkg-tool/openpkg-index.pl 6 Feb 2003 06:52:50 -0000 1.14
+++ openpkg-src/openpkg-tool/openpkg-index.pl 12 Feb 2003 10:10:23 -0000 1.15
@@ -271,7 +271,7 @@
} elsif (exists $evar{$3}) {
$term .= ($4 eq 'no' ? '! ' : '').vsub(\%evar,'%{'.$3.'}');
} else {
- warn "WARNING: unknown conditional '$2':\n< $l\n> $v\n";
+ warn "WARNING: unknown conditional '$3':\n< $l\n> $v\n";
}
}
@@ -312,9 +312,17 @@
#
if (exists $evar{$1}) {
if ($2 eq 'yes') {
- $evar{$1} = "( \%\{$1\} || ( $cond ) )";
+ if ($cond eq '') {
+ $evar{$1} = "( \%\{$1\} )";
+ } else {
+ $evar{$1} = "( \%\{$1\} || ( $cond ) )";
+ }
} elsif ($2 eq 'no') {
- $evar{$1} = "( %\{$1\} && ! ( $cond ) )";
+ if ($cond eq '') {
+ $evar{$1} = "( \%\{$1\} )";
+ } else {
+ $evar{$1} = "( %\{$1\} && ! ( $cond ) )";
+ }
} else {
warn "WARNING: logic too complex for '$1':\n< $l\n> $v\n";
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 7 Feb 2003 13:11:46 -0000
1.35
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 12 Feb 2003 10:10:23 -0000
1.36
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Bootstrapping
License: GPL
-Version: 20030207
-Release: 20030207
+Version: 20030212
+Release: 20030212
# list of sources
Source0: openpkg.sh
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3275 -r1.3276 news.txt
--- openpkg-web/news.txt 12 Feb 2003 10:00:41 -0000 1.3275
+++ openpkg-web/news.txt 12 Feb 2003 10:10:22 -0000 1.3276
@@ -1,3 +1,4 @@
+12-Feb-2003: Upgraded package: P<openpkg-tool-20030212-20030212>
12-Feb-2003: Upgraded package: P<apache-1.3.27-20030212>
12-Feb-2003: Upgraded package: P<lmtp2nntp-1.2b2-20030212>
12-Feb-2003: Upgraded package: P<postgresql-7.3.2-20030212>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
