Bug #266211 - Handle ESTALE like ENOENT in fetch and locking code. Thanks to

Krzysztof Olędzki <ole+gentoo@ans.pl> for the initial patch. (trunk r13347)

svn path=/main/branches/2.1.6/; revision=13503

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 3dada67970ca66f23217b8ed2ce9b055ee19f400..fba07547fa4dc612f737738edd68c1d5e377bacb 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3914,7 +3914,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                try:
                                        mysize = os.stat(myfile_path).st_size
                                except OSError, e:
-                                       if e.errno != errno.ENOENT:
+                                       if e.errno not in (errno.ENOENT, errno.ESTALE):
                                                raise
                                        del e
                                        mysize = 0
@@ -4026,7 +4026,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                try:
                                                        os.unlink(myfile_path)
                                                except OSError, e:
-                                                       if e.errno != errno.ENOENT:
+                                                       if e.errno not in (errno.ENOENT, errno.ESTALE):
                                                                raise
                                                        del e
                                                os.symlink(readonly_file, myfile_path)
@@ -4041,14 +4041,14 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                                " %(file)s\n" % {"file":myfile}))
                                                        break
                                                except (IOError, OSError), e:
-                                                       if e.errno != errno.ENOENT:
+                                                       if e.errno not in (errno.ENOENT, errno.ESTALE):
                                                                raise
                                                        del e
 
                                try:
                                        mystat = os.stat(myfile_path)
                                except OSError, e:
-                                       if e.errno != errno.ENOENT:
+                                       if e.errno not in (errno.ENOENT, errno.ESTALE):
                                                raise
                                        del e
                                else:
@@ -4192,7 +4192,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                try:
                                                        mysize = os.stat(myfile_path).st_size
                                                except OSError, e:
-                                                       if e.errno != errno.ENOENT:
+                                                       if e.errno not in (errno.ENOENT, errno.ESTALE):
                                                                raise
                                                        del e
                                                        mysize = 0
@@ -4216,7 +4216,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                try:
                                                        mystat = os.stat(myfile_path)
                                                except OSError, e:
-                                                       if e.errno != errno.ENOENT:
+                                                       if e.errno not in (errno.ENOENT, errno.ESTALE):
                                                                raise
                                                        del e
                                                        fetched = 0
@@ -4228,7 +4228,8 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                                try:
                                                                        os.unlink(myfile_path)
                                                                except OSError, e:
-                                                                       if e.errno != errno.ENOENT:
+                                                                       if e.errno not in \
+                                                                               (errno.ENOENT, errno.ESTALE):
                                                                                raise
                                                                        del e
                                                                fetched = 0
@@ -4282,7 +4283,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                try:
                                                        mystat = os.stat(myfile_path)
                                                except OSError, e:
-                                                       if e.errno != errno.ENOENT:
+                                                       if e.errno not in (errno.ENOENT, errno.ESTALE):
                                                                raise
                                                        del e
                                                        fetched = 0

diff --git a/pym/portage/locks.py b/pym/portage/locks.py
index 36bc085bf227b0efe4e00f2782b9b1c8e514ca90..05a65644fe806b04f46ecd22c03e32372321c598 100644 (file)
--- a/pym/portage/locks.py
+++ b/pym/portage/locks.py
@@ -74,7 +74,7 @@ def lockfile(mypath, wantnewlockfile=0, unlinkfile=0,
                                        if os.stat(lockfilename).st_gid != portage_gid:
                                                os.chown(lockfilename, -1, portage_gid)
                                except OSError, e:
-                                       if e.errno == errno.ENOENT: # No such file or directory
+                                       if e.errno in (errno.ENOENT, errno.ESTALE):
                                                return lockfile(mypath,
                                                        wantnewlockfile=wantnewlockfile,
                                                        unlinkfile=unlinkfile, waiting_msg=waiting_msg,
@@ -164,7 +164,7 @@ def _fstat_nlink(fd):
        try:
                return os.fstat(fd).st_nlink
        except EnvironmentError, e:
-               if e.errno == errno.ENOENT:
+               if e.errno in (errno.ENOENT, errno.ESTALE):
                        # Some filesystems such as CIFS return
                        # ENOENT which means st_nlink == 0.
                        return 0