OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 10-Jul-2003 10:33:59
Branch: HEAD Handle: 2003071009335900
Modified files:
openpkg-re rclint.pl
Log:
%env is not special in bootstrap
Summary:
Revision Changes Path
1.9 +14 -17 openpkg-re/rclint.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/rclint.pl
============================================================================
$ cvs diff -u -r1.8 -r1.9 rclint.pl
--- openpkg-re/rclint.pl 10 Jul 2003 08:03:06 -0000 1.8
+++ openpkg-re/rclint.pl 10 Jul 2003 08:33:59 -0000 1.9
@@ -392,25 +392,22 @@
# check env
if ($section =~ m/^%(env)$/) {
- if ($pkg !~ m/^openpkg$/) { #FIXME really special !?
+ # check opServiceEnabled short circuit
+ $done = $outer_done; $this = ''; $todo = $outer_this;
+ if ( $todo =~ m/^[^\n]+\n opServiceEnabled \w+ \|\| exit 0\n/s ) {
+ &lint_warning($file, $done, $this, "section $section: opServiceEnabled
short circuit not allowed here");
+ }
- # check opServiceEnabled short circuit
+ # check required if ... opServiceEnabled construct
+ $done = $outer_done; $this = ''; $todo = $outer_this;
+ if ( $todo !~ m/^[^\n]+\n if opServiceEnabled \w+; then\n/s ) {
+ &lint_warning($file, $done, $this, "section $section: required if ...
opServiceEnabled construct missing");
+ }
+ else {
+ # check required if ... opServiceEnabled package reference
$done = $outer_done; $this = ''; $todo = $outer_this;
- if ( $todo =~ m/^[^\n]+\n opServiceEnabled \w+ \|\| exit 0\n/s ) {
- &lint_warning($file, $done, $this, "section $section:
opServiceEnabled short circuit not allowed here");
- }
-
- # check required if ... opServiceEnabled construct
- $done = $outer_done; $this = ''; $todo = $outer_this;
- if ( $todo !~ m/^[^\n]+\n if opServiceEnabled \w+; then\n/s ) {
- &lint_warning($file, $done, $this, "section $section: required if
... opServiceEnabled construct missing");
- }
- else {
- # check required if ... opServiceEnabled package reference
- $done = $outer_done; $this = ''; $todo = $outer_this;
- if ( $todo !~ m/^[^\n]+\n if opServiceEnabled $pkgu; then\n/s ) {
- &lint_warning($file, $done, $this, "section $section: if ...
opServiceEnabled referencing wrong package");
- }
+ if ( $todo !~ m/^[^\n]+\n if opServiceEnabled $pkgu; then\n/s ) {
+ &lint_warning($file, $done, $this, "section $section: if ...
opServiceEnabled referencing wrong package");
}
}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
