[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.4.3-182-gc374038



The following commit has been merged in the master branch:
commit add031b97b88b95c2e6dcf16f7d7f59261fe043b
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jan 26 18:12:57 2011 +0100

    Do not assume that the Ubuntu version regex will succeed

diff --git a/checks/fields b/checks/fields
index ac88727..37d050f 100644
--- a/checks/fields
+++ b/checks/fields
@@ -240,10 +240,10 @@ if (not defined $info->field('version')) {
 			tag 'debian-revision-should-not-be-zero', "$version"
 				if $debian eq '-0';
 			my $ubuntu;
-			if($debian =~ /^-(?:[^.]+)(?:\.[^.]+)?(?:\.[^.]+)?(\..*)?$/){
+			if($debian =~ /^-(?:[^.]+)(?:\.[^.]+)?(?:\.[^.]+)?(\..*)?$/o){
 			    my $extra = $1;
-			    if (defined $extra) {
-				$debian =~ /^-(?:[^.]+ubuntu[^.]+)(?:\.\d+){1,3}(\..*)?$/;
+			    if (defined $extra
+				&& $debian =~ /^-(?:[^.]+ubuntu[^.]+)(?:\.\d+){1,3}(\..*)?$/o){
 				$ubuntu = 1;
 				$extra = $1;
 			    }

-- 
Debian package checker


Reply to: