[debsums] 116/184: fix handling of O_NOATIME on arches that don't defined O_NOATIME (Closes: 559551)

[Axel Beckert]

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

abe pushed a commit to branch master
in repository debsums.

commit e4edd7bb2cc965e7da7ab90bfa1311fbf0d6fd02
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Sun Dec 20 12:59:16 2009 -0800

    fix handling of O_NOATIME on arches that don't defined O_NOATIME (Closes: 559551)
---
 debian/changelog | 4 +++-
 debsums.in       | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d22ad3f..d9bd099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ debsums (2.0.48) UNRELEASED; urgency=low
   * reword the --ignore-permissions documentation to say that it makes
     error get treated as warnings, thanks Sandro (Closes: #546977)
   * update email address
+  * fix handling of O_NOATIME on arches that don't defined O_NOATIME
+    (Closes: 559551)
 
- -- Ryan Niebur <ryan at debian.org>  Sun, 20 Dec 2009 12:50:51 -0800
+ -- Ryan Niebur <ryan at debian.org>  Sun, 20 Dec 2009 12:59:13 -0800
 
 debsums (2.0.47) unstable; urgency=low
 
diff --git a/debsums.in b/debsums.in
index 980c286..5a367e1 100755
--- a/debsums.in
+++ b/debsums.in
@@ -80,6 +80,9 @@ sub can_ignore {
   return $!{EACCES} && $ignore_permissions && getuid();
 }
 
+my $my_noatime = 0;
+eval { $my_noatime = O_NOATIME };
+
 sub warn_or_die {
   if(can_ignore()) {
     unless($silent) {
@@ -274,7 +277,7 @@ sub is_replaced
 	$path = $diversion{$path}[0] if exists $diversion{$path}
 	    and $diversion{$path}[1] ne $pack;
 
-	if ((!sysopen F, "$root/$path", O_RDONLY|O_NONBLOCK|O_NOATIME) &&
+	if ((!sysopen F, "$root/$path", O_RDONLY|O_NONBLOCK|$my_noatime) &&
            (!sysopen F, "$root/$path", O_RDONLY|O_NONBLOCK))
 	{
 	    return 0 if $localepurge

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