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

[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-160-gf996fbf



The following commit has been merged in the master branch:
commit f996fbfa9fa1e8e47ca5cf81729bff28d9875d54
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Apr 21 11:58:14 2011 +0200

    Skip changelog-format for all non-sid releases (e.g. backports)

diff --git a/t/scripts/changelog-format.t b/t/scripts/changelog-format.t
index 559f3b1..33497d8 100755
--- a/t/scripts/changelog-format.t
+++ b/t/scripts/changelog-format.t
@@ -27,7 +27,7 @@ use Parse::DebianChangelog;
 my $changelog = Parse::DebianChangelog->init({ infile => 'debian/changelog' })
 		or BAIL_OUT('fatal error while loading parser');
 
-plan skip_all => 'Only valid for Debian releases'
+plan skip_all => 'Only valid for regular Debian releases'
     if should_skip($changelog);
 my $changes = $changelog->dpkg()->{'Changes'};
 my $line = 0;
@@ -97,6 +97,8 @@ done_testing();
 
 sub should_skip{
     my ($changelog) = @_;
-    return $changelog->dpkg->{'Version'} =~ m/ubuntu/;
+    my $version = $changelog->dpkg->{'Version'};
+    # Normal releases look something like X.Y.Z or X.Y.Z~rcR
+    return $version !~ m/^\d+(?:\.\d+)*(?:\~rc\d+)?$/o;
 }
 

-- 
Debian package checker


Reply to: