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: 21-Jul-2003 11:57:08 Branch: HEAD Handle: 2003072110570800 Modified files: openpkg-re speclint.pl Log: extend l_value check to "shtool subst"; closer matching; use backref for same var replacement matching only; check for uid/gid, too Summary: Revision Changes Path 1.38 +4 -3 openpkg-re/speclint.pl ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-re/speclint.pl ============================================================================ $ cvs diff -u -r1.37 -r1.38 speclint.pl --- openpkg-re/speclint.pl 21 Jul 2003 08:47:22 -0000 1.37 +++ openpkg-re/speclint.pl 21 Jul 2003 09:57:08 -0000 1.38 @@ -858,11 +858,12 @@ $done .= $this; } - # check for deprecated use of "shtool install -e @l_...@ %{l_...}" + # check for deprecated use of "shtool install|subst -e @l_...@ %{l_...}" my $done = ''; my $this = ''; my $todo = $spec; - while ($todo =~ m/%{l_shtool} [EMAIL PROTECTED](prefix|[mrn](usr|grp))\@/s) { + #while ($todo =~ m/%{l_shtool} (install|subst)[EMAIL PROTECTED](prefix|[mrn](usr|grp))\@/s) { + while ($todo =~ m/%{l_shtool} (install|subst)(?:\\\n|[^\n])*?-e(?:\\\n|[^\n])[EMAIL PROTECTED](prefix|[smrn](usr|grp|uid|gid))[EMAIL PROTECTED]/s) { $done .= $`; $this = $&; $todo = $'; - &lint_warning($file, $done, $this, "deprecated usage of \"shtool install -e [EMAIL PROTECTED]@\" (expected use of %{l_value ...})"); + &lint_warning($file, $done, $this, "deprecated usage of \"shtool $1 -e [EMAIL PROTECTED]@\" (expected use of %{l_value -s -a})"); $done .= $this; } @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]