1. mirror
  2. cpython


Éric Araujo  committed d978828

Ignore .nfs* files in distutils (#7719).

These files are created by some NFS clients a file is edited and removed
concurrently (see added link in doc for more info). If such a file is
removed between distutils calls listdir and copy, it will get confused.
Other special files are ignored in sdist (namely VCS directories), but
this has to be filtered out earlier.

  • Participants
  • Parent commits fed7306
  • Branches 3.2

Comments (0)

Files changed (5)

File Doc/distutils/apiref.rst

View file
  • Ignore whitespace
    destination of the symlink will be copied.  *update* and *verbose* are the same
    as for :func:`copy_file`.
+   Files in *src* that begin with :file:`.nfs` are skipped (more information on
+   these files is available in answer D2 of the `NFS FAQ page
+   <http://nfs.sourceforge.net/#section_d>`_.
+   .. versionchanged:: 3.2.4
+      NFS files are ignored.
 .. function:: remove_tree(directory[, verbose=0, dry_run=0])

File Lib/distutils/dir_util.py

View file
  • Ignore whitespace
         src_name = os.path.join(src, n)
         dst_name = os.path.join(dst, n)
+        if n.startswith('.nfs'):
+            # skip NFS rename files
+            continue
         if preserve_symlinks and os.path.islink(src_name):
             link_dest = os.readlink(src_name)
             if verbose >= 1:

File Lib/distutils/tests/test_dir_util.py

View file
  • Ignore whitespace
         remove_tree(self.root_target, verbose=0)
     def test_copy_tree_verbosity(self):
         mkpath(self.target, verbose=0)
         mkpath(self.target, verbose=0)
         a_file = os.path.join(self.target, 'ok.txt')
-        f = open(a_file, 'w')
-        try:
+        with open(a_file, 'w') as f:
             f.write('some content')
-        finally:
-            f.close()
         wanted = ['copying %s -> %s' % (a_file, self.target2)]
         copy_tree(self.target, self.target2, verbose=1)
         remove_tree(self.root_target, verbose=0)
         remove_tree(self.target2, verbose=0)
+    def test_copy_tree_skips_nfs_temp_files(self):
+        mkpath(self.target, verbose=0)
+        a_file = os.path.join(self.target, 'ok.txt')
+        nfs_file = os.path.join(self.target, '.nfs123abc')
+        for f in a_file, nfs_file:
+            with open(f, 'w') as fh:
+                fh.write('some content')
+        copy_tree(self.target, self.target2)
+        self.assertEqual(os.listdir(self.target2), ['ok.txt'])
+        remove_tree(self.root_target, verbose=0)
+        remove_tree(self.target2, verbose=0)
     def test_ensure_relative(self):
         if os.sep == '/':
             self.assertEqual(ensure_relative('/home/foo'), 'home/foo')

File Lib/distutils/tests/test_sdist.py

View file
  • Ignore whitespace
     @unittest.skipUnless(ZLIB_SUPPORT, 'Need zlib support to run')
     def test_prune_file_list(self):
-        # this test creates a package with some vcs dirs in it
-        # and launch sdist to make sure they get pruned
-        # on all systems
+        # this test creates a project with some VCS dirs and an NFS rename
+        # file, then launches sdist to check they get pruned on all systems
         # creating VCS directories with some files in them
         os.mkdir(join(self.tmp_dir, 'somecode', '.svn'))
         self.write_file((self.tmp_dir, 'somecode', '.git',
                          'ok'), 'xxx')
+        self.write_file((self.tmp_dir, 'somecode', '.nfs0001'), 'xxx')
         # now building a sdist
         dist, cmd = self.get_cmd()

File Misc/NEWS

View file
  • Ignore whitespace
 - Issue #16628: Fix a memory leak in ctypes.resize().
+- Issue #7719: Make distutils ignore ``.nfs*`` files instead of choking later
+  on.  Initial patch by SilentGhost and Jeff Ramnani.
 - Issue #13120: Allow to call pdb.set_trace() from thread.
   Patch by Ilya Sandler.