[libconfig-model-dpkg-perl] 01/03: fix ares check to cope with section like 'gnu-r' (Closes: #735308)

dod at debian.org dod at debian.org
Tue Jan 14 17:45:37 UTC 2014


This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.

commit 45b7d6fda05f48a2cc0b2263195d9121ba09e790
Author: Dominique Dumont <dod at debian.org>
Date:   Tue Jan 14 18:41:54 2014 +0100

    fix ares check to cope with section like 'gnu-r' (Closes: #735308)
---
 lib/Config/Model/models/Dpkg/Control/Binary.pl | 2 +-
 lib/Config/Model/models/Dpkg/Control/Source.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Config/Model/models/Dpkg/Control/Binary.pl b/lib/Config/Model/models/Dpkg/Control/Binary.pl
index 50d715b..e461d02 100644
--- a/lib/Config/Model/models/Dpkg/Control/Binary.pl
+++ b/lib/Config/Model/models/Dpkg/Control/Binary.pl
@@ -44,7 +44,7 @@ A package may specify an architecture wildcard. Architecture wildcards are in th
         'value_type' => 'uniline',
         'warn_unless' => {
           'area' => {
-            'code' => '(not defined) or m!^((contrib|non-free)/)?\\w+$!;',
+            'code' => '(not defined) or m!^((contrib|non-free)/)?[\\w\\-]+$!;',
             'msg' => 'Bad area. Should be \'non-free\' or \'contrib\''
           },
           'section' => {
diff --git a/lib/Config/Model/models/Dpkg/Control/Source.pl b/lib/Config/Model/models/Dpkg/Control/Source.pl
index 819e314..fceac40 100644
--- a/lib/Config/Model/models/Dpkg/Control/Source.pl
+++ b/lib/Config/Model/models/Dpkg/Control/Source.pl
@@ -63,7 +63,7 @@ area/section if the package is in the contrib or non-free archive areas.
         'value_type' => 'uniline',
         'warn_unless' => {
           'area' => {
-            'code' => '(not defined) or m!^((contrib|non-free)/)?\\w+$!;',
+            'code' => '(not defined) or m!^((contrib|non-free)/)?[\\w\\-]+$!;',
             'msg' => 'Bad area. Should be \'non-free\' or \'contrib\''
           },
           'empty' => {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git



More information about the Pkg-perl-cvs-commits mailing list