For bug #182964, replace os.rename() with shutil.move() in order to handle EXDEV...

svn path=/main/branches/2.1.2/; revision=6968

diff --git a/bin/emerge b/bin/emerge
index 3d6e9e245ebf30c0e8ce040fa90a008b4420d2b0..914f8d69c39452a869fbe182fd77d32065aad7c5 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3696,14 +3696,17 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
 
                        icount=0
                        badcount=0
+                       import shutil
                        for inforoot in regen_infodirs:
                                if inforoot=='':
                                        continue
                                for filename in ("dir", "dir.gz", "dir.bz2"):
                                        file_path = os.path.join(inforoot, filename)
+                                       if not os.path.exists(file_path):
+                                               continue
                                        try:
-                                               os.rename(file_path, file_path + ".old")
-                                       except OSError, e:
+                                               shutil.move(file_path, file_path + ".old")
+                                       except EnvironmentError, e:
                                                if e.errno != errno.ENOENT:
                                                        raise
                                                del e

diff --git a/pym/dispatch_conf.py b/pym/dispatch_conf.py
index 690772bf85a6c201b439811de7e0c3e8eaec0199..6df0146d5d233df9ddfe2f6713dba6c74dde1d94 100644 (file)
--- a/pym/dispatch_conf.py
+++ b/pym/dispatch_conf.py
@@ -7,7 +7,7 @@
 # Library by Wayne Davison <gentoo@blorf.net>, derived from code
 # written by Jeremy Wohl (http://igmus.org)
 
-from stat import *
+from stat import ST_GID, ST_MODE, ST_UID
 import os, sys, commands, shutil
 
 import portage
@@ -72,7 +72,7 @@ def rcs_archive(archive, curconf, newconf, mrgconf):
         os.system(RCS_GET + ' -r' + RCS_BRANCH + ' ' + archive)
         has_branch = os.path.exists(archive)
         if has_branch:
-            os.rename(archive, archive + '.dist')
+            shutil.move(archive, archive + '.dist')
 
         try:
             shutil.copy2(newconf, archive)
@@ -87,7 +87,7 @@ def rcs_archive(archive, curconf, newconf, mrgconf):
                 mystat = os.lstat(newconf)
                 os.chmod(mrgconf, mystat[ST_MODE])
                 os.chown(mrgconf, mystat[ST_UID], mystat[ST_GID])
-        os.rename(archive, archive + '.dist.new')
+        shutil.move(archive, archive + '.dist.new')
     return ret
 
 
@@ -112,10 +112,10 @@ def file_archive(archive, curconf, newconf, mrgconf):
             suf += 1
 
         while suf > 1:
-            os.rename(archive + '.' + str(suf-1), archive + '.' + str(suf))
+            shutil.move(archive + '.' + str(suf-1), archive + '.' + str(suf))
             suf -= 1
 
-        os.rename(archive, archive + '.1')
+        shutil.move(archive, archive + '.1')
 
     try:
         shutil.copy2(curconf, archive)
@@ -145,7 +145,7 @@ def file_archive(archive, curconf, newconf, mrgconf):
 def rcs_archive_post_process(archive):
     """Check in the archive file with the .dist.new suffix on the branch
     and remove the one with the .dist suffix."""
-    os.rename(archive + '.dist.new', archive)
+    shutil.move(archive + '.dist.new', archive)
     if os.path.exists(archive + '.dist'):
         # Commit the last-distributed version onto the branch.
         os.system(RCS_LOCK + RCS_BRANCH + ' ' + archive)
@@ -158,4 +158,4 @@ def rcs_archive_post_process(archive):
 
 def file_archive_post_process(archive):
     """Rename the archive file with the .dist.new suffix to a .dist suffix"""
-    os.rename(archive + '.dist.new', archive + '.dist')
+    shutil.move(archive + '.dist.new', archive + '.dist')

diff --git a/pym/portage.py b/pym/portage.py
index d2f2cb027f0769a84ed594f33ec5016039d8a60b..1f6ef39c02d1c9c0a3d261662a8ff9bc6892eed3 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5264,16 +5264,16 @@ class vardbapi(dbapi):
                        if os.path.exists(newpath):
                                #dest already exists; keep this puppy where it is.
                                continue
-                       os.rename(origpath, newpath)
+                       shutil.move(origpath, newpath)
 
                        # We need to rename the ebuild now.
                        old_pf = catsplit(mycpv)[1]
                        new_pf = catsplit(mynewcpv)[1]
                        if new_pf != old_pf:
                                try:
-                                       os.rename(os.path.join(newpath, old_pf + ".ebuild"),
+                                       shutil.move(os.path.join(newpath, old_pf + ".ebuild"),
                                                os.path.join(newpath, new_pf + ".ebuild"))
-                               except OSError, e:
+                               except EnvironmentError, e:
                                        if e.errno != errno.ENOENT:
                                                raise
                                        del e
@@ -6489,7 +6489,7 @@ class binarytree(object):
                                        if e.errno != errno.EEXIST:
                                                raise
                                        del e
-                               os.rename(tbz2path, new_path)
+                               shutil.move(tbz2path, new_path)
                                self._remove_symlink(mycpv)
                                if new_path.split(os.path.sep)[-2] == "All":
                                        self._create_symlink(mynewcpv)
@@ -6587,7 +6587,7 @@ class binarytree(object):
                                if e.errno != errno.EEXIST:
                                        raise
                                del e
-                       os.rename(src_path, os.path.join(self.pkgdir, "All", myfile))
+                       shutil.move(src_path, os.path.join(self.pkgdir, "All", myfile))
                        self._create_symlink(cpv)
                self._pkg_paths[cpv] = os.path.join("All", myfile)
 
@@ -6605,7 +6605,7 @@ class binarytree(object):
                        if e.errno != errno.EEXIST:
                                raise
                        del e
-               os.rename(os.path.join(self.pkgdir, "All", myfile), dest_path)
+               shutil.move(os.path.join(self.pkgdir, "All", myfile), dest_path)
                self._pkg_paths[cpv] = mypath
 
        def populate(self, getbinpkgs=0,getbinpkgsonly=0):
@@ -7051,7 +7051,7 @@ class dblink:
                                if x[:-7] != self.pkg:
                                        # Clean up after vardbapi.move_ent() breakage in
                                        # portage versions before 2.1.2
-                                       os.rename(os.path.join(self.dbdir, x), myebuildpath)
+                                       shutil.move(os.path.join(self.dbdir, x), myebuildpath)
                                        write_atomic(os.path.join(self.dbdir, "PF"), self.pkg+"\n")
                                break