OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 21-Jul-2003 13:54:11
Branch: HEAD Handle: 2003072112541100
Modified files:
openpkg-re speclint.pl
Log:
remove debug messages; activate again some more 'shtool install'
checks by making it aware of %{l_value}
Summary:
Revision Changes Path
1.39 +11 -8 openpkg-re/speclint.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/speclint.pl
============================================================================
$ cvs diff -u -r1.38 -r1.39 speclint.pl
--- openpkg-re/speclint.pl 21 Jul 2003 09:57:08 -0000 1.38
+++ openpkg-re/speclint.pl 21 Jul 2003 11:54:11 -0000 1.39
@@ -688,8 +688,6 @@
# catch command termination by semicolon, pipe, or, and;
$subthis =~ s/[;|&].*$//s;
if ($subthis =~ m/\s-[a-zA-Z]\S/) {
- print "\nDEBUG: <<<< subthis=%s", $subthis;
- print "\nDEBUG: >>>> subthis=%s", $subthis;
&lint_warning($file, $done, $this, "found use of shtool option with
space omitted before argument");
}
@@ -721,6 +719,13 @@
elsif ($cmd[$i] eq '%{SOURCE') {
splice(@cmd, $i, 2, $cmd[$i].$cmd[$i+1]);
}
+ elsif ($cmd[$i] eq '%{l_value') {
+ while ($i < $#cmd and $cmd[$i+1] !~ m|\}$|s) {
+ splice(@cmd, $i, 2, $cmd[$i].$cmd[$i+1]);
+ }
+ splice(@cmd, $i, 2);
+ $i--;
+ }
}
# determine last path argument
@@ -729,17 +734,15 @@
# check paths
if (($#cmd - $i) > 2 and $cmd[-1] !~ m|/$|) {
# simple case: multiple sources require target to be a directory
- # FIXME
- #&lint_warning($file, $done, $this, "section $section: missing
trailing slash on " .
- # "destination path in \"shtool install\" command
(expected one) 1");
+ &lint_warning($file, $done, $this, "section $section: missing
trailing slash on " .
+ "destination path in \"shtool install\" command
(expected one) 1");
}
elsif (($#cmd - $i) == 2 and $cmd[-1] !~ m|/$|) {
# complex case: single source, so we can check only known
destination paths
if ( $cmd[-1] =~
m/\%\{l_prefix\}\/(bin|cgi|include|info|lib|pub|sbin)$/
or $cmd[-1] =~
m/\%\{l_prefix\}\/(etc|libexec|man|share|var)(\/[^\/]+)?$/) {
- # FIXME
- #&lint_warning($file, $done, $this, "section $section: missing
trailing slash on " .
- # "destination path in \"shtool install\" command
(expected one) 2");
+ &lint_warning($file, $done, $this, "section $section: missing
trailing slash on " .
+ "destination path in \"shtool install\" command
(expected one) 2");
}
}
else {
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
