[debsums] 84/184: Fall back on regular sysopen if the NOATIME one fails (closes: #519816)

[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 11a0173002aa05a4b53a52b16ae2c3c4b2bcd67a
Author: Francois Marier <francois at debian.org>
Date:   Mon Mar 16 08:55:05 2009 +1300

    Fall back on regular sysopen if the NOATIME one fails (closes: #519816)
---
 debian/changelog | 6 ++++++
 debsums.in       | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4e59466..54ebe1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debsums (2.0.43) unstable; urgency=low
+
+  * Fall back on regular sysopen if the NOATIME one fails (closes: #519816)
+
+ -- Francois Marier <francois at debian.org>  Mon, 16 Mar 2009 08:53:43 +1300
+
 debsums (2.0.42) unstable; urgency=low
 
   * Open files with O_NOATIME to reduce disk activity (closes: #518608)
diff --git a/debsums.in b/debsums.in
index e585cd5..f2c3db0 100755
--- a/debsums.in
+++ b/debsums.in
@@ -254,7 +254,8 @@ sub is_replaced
 	$path = $diversion{$path}[0] if exists $diversion{$path}
 	    and $diversion{$path}[1] ne $pack;
 
-	unless (sysopen F, "$root/$path", O_RDONLY|O_NONBLOCK|O_NOATIME)
+	if ((!sysopen F, "$root/$path", O_RDONLY|O_NONBLOCK|O_NOATIME) &&
+           (!sysopen F, "$root/$path", O_RDONLY|O_NONBLOCK))
 	{
 	    return 0 if $localepurge
 		and $path =~ m!^usr/share/(?:man|locale)/([^/]+)/!

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