From d89df07a5915bbee7d7a57983a83dfb284c0895c Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:53:13 +0000
Subject: Made NFS locking bail out Author: jgg Date: 1999-03-20 03:49:31 GMT
 Made NFS locking bail out

---
 apt-pkg/contrib/fileutl.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 0839cc963..67f65b411 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: fileutl.cc,v 1.24 1999/03/17 03:25:25 jgg Exp $
+// $Id: fileutl.cc,v 1.25 1999/03/20 03:49:31 jgg Exp $
 /* ######################################################################
    
    File Utilities
@@ -83,6 +83,11 @@ int GetLock(string File,bool Errors)
    fl.l_len = 0;
    if (fcntl(FD,F_SETLK,&fl) == -1)
    {
+      if (errno == ENOLCK)
+      {
+	 _error->Warning("Not using locking for nfs mounted lock file %s",File.c_sr());
+	 return true;
+      }      
       if (Errors == true)
 	 _error->Errno("open","Could not get lock %s",File.c_str());
       close(FD);
-- 
cgit v1.2.3