Merge pull request quattor#136 from stdweird/pan_template_check

Test/Quattor/Panc: refine valid annotation
jouvin · Mar 4, 2017 · 86ebce6 · 86ebce6
2 parents 35c1857 + 300ce7f
commit 86ebce6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/build-scripts/src/main/perl/Test/Quattor/Panc.pm b/build-scripts/src/main/perl/Test/Quattor/Panc.pm
@@ -154,8 +154,8 @@ sub is_object_template
     while (my $line = <$TPL>) {
         chomp($line);
         next if ($line =~ m/^\s*($|#)/); # ignore whitespace/comments
-        if ($line =~ m/^\s*@\{/ || $annotation) {
-            $annotation = $line !~ m/(^\s*@\{.*|@)\}\s*$/;
+        if ($line =~ m/^\s*@\w*\{/ || $annotation) {
+            $annotation = $line !~ m/\}\s*$/;
         } else {
             $ok = $line =~ m/^\s*object\s*template/;
             last;