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: 15-Jul-2003 10:42:23 Branch: HEAD Handle: 2003071509422200 Modified files: openpkg-re rclint.pl Log: handle openpkg package _rc_def and _rc_all before _enable Summary: Revision Changes Path 1.11 +13 -4 openpkg-re/rclint.pl ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-re/rclint.pl ============================================================================ $ cvs diff -u -r1.10 -r1.11 rclint.pl --- openpkg-re/rclint.pl 14 Jul 2003 15:13:04 -0000 1.10 +++ openpkg-re/rclint.pl 15 Jul 2003 08:42:22 -0000 1.11 @@ -398,10 +398,19 @@ &lint_warning($file, $done, $this, "section $section: wrong default for ${pkgu}_enable"); } - # _enable, if used, must be the first variable - $done = $outer_done; $this = ''; $todo = $outer_this; - if ( $todo =~ m/ [^=]+_enable=[^\n]+/s and $todo !~ m/%config\n( [A-Z]+_[a-z_]+=[^\n]*\n)* [^=]+_enable=[^\n]+/s) { - &lint_warning($file, $done, $this, "section $section: ${pkgu}_enable must be the first lowercase variable"); + if ($pkg eq "openpkg") { + # openpkg_rc before _enable, if used, must be the first variable + $done = $outer_done; $this = ''; $todo = $outer_this; + if ( $todo !~ m/%config\n( [A-Z]+_[a-z_]+=[^\n]*\n)* openpkg_rc_def=[^\n]+?\n openpkg_rc_all=[^\n]+?\n [^=]+_enable=[^\n]+/s) { + &lint_warning($file, $done, $this, "section $section: openpkg_rc_def, openpkg_rc_all and ${pkgu}_enable must be the first lowercase variable"); + } + } + else { + # _enable, if used, must be the first variable + $done = $outer_done; $this = ''; $todo = $outer_this; + if ( $todo =~ m/ [^=]+_enable=[^\n]+/s and $todo !~ m/%config\n( [A-Z]+_[a-z_]+=[^\n]*\n)* [^=]+_enable=[^\n]+/s) { + &lint_warning($file, $done, $this, "section $section: ${pkgu}_enable must be the first lowercase variable"); + } } return; } @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]