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

abe pushed a commit to branch master
in repository debsums.

commit f9e7c7e098452186ada35f4c58036e67ca9e27b1
Author: Ryan Niebur <ryanrya...@gmail.com>
Date:   Sun Dec 20 13:24:03 2009 -0800

    update localepurge handling (Closes: #548278)
---
 debian/changelog |  3 ++-
 debsums.in       | 22 ++++++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9bd099..81d5c39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ debsums (2.0.48) UNRELEASED; urgency=low
   * update email address
   * fix handling of O_NOATIME on arches that don't defined O_NOATIME
     (Closes: 559551)
+  * update localepurge handling (Closes: #548278)
 
- -- Ryan Niebur <r...@debian.org>  Sun, 20 Dec 2009 12:59:13 -0800
+ -- Ryan Niebur <r...@debian.org>  Sun, 20 Dec 2009 13:23:58 -0800
 
 debsums (2.0.47) unstable; urgency=low
 
diff --git a/debsums.in b/debsums.in
index 5a367e1..f4d48a5 100755
--- a/debsums.in
+++ b/debsums.in
@@ -266,6 +266,25 @@ sub is_replaced
     0;
 }
 
+sub is_localepurge_file {
+    my $path = shift;
+    my $locale = "";
+    if($path =~ m!usr/share/(locale|man|gnome/help|omf|doc/kde/HTML)/!) {
+        my $type = $1;
+        if($type eq "man" || $type eq "locale" || $type eq "doc/kde/HTML") {
+          $path =~ m!^usr/share/(?:man|locale|doc/kde/HTML)/([^/]+)/!;
+          $locale = $1;
+        } elsif($type eq "gnome/help") {
+          $path =~ m!^usr/share/gnome/help/[^/]+/([^/]+)/!;
+          $locale = $1;
+        } elsif($type eq "omf") {
+          $path =~ m!^usr/share/omf/([^/]+)/\1-([^/]+).omf$!;
+          $locale = $2;
+        }
+    }
+    return length($locale) && !$locales{$locale};
+}
+
 {
     my $width = ($ENV{COLUMNS} || 80) - 3;
     $width = 6 if $width < 6;
@@ -281,8 +300,7 @@ sub is_replaced
            (!sysopen F, "$root/$path", O_RDONLY|O_NONBLOCK))
        {
            return 0 if $localepurge
-               and $path =~ m!^usr/share/(?:man|locale)/([^/]+)/!
-               and !$locales{$1};
+                and is_localepurge_file($path);
 
            my $err = "$self: can't open $pack file $root/$path ($!)\n";
             if(can_ignore()) {

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

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to