Remove pointless closing of stdin that is done prior to metadata transfer and use...

svn path=/main/branches/2.1/; revision=3561

diff --git a/bin/emerge b/bin/emerge
index fd5eb7f0799c159c2edfde6b394b6bccd462be87..3172fad5be5912404428ba8aff24bcea52b49cb5 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2930,11 +2930,6 @@ if myaction in ["sync","metadata"] and (not "--help" in myopts):
                print "!!! rsync setting: ",syncuri,"not recognized; exiting."
                sys.exit(1)
 
-       try: # Prevent users from affecting ebuild.sh.
-               os.close(sys.stdin.fileno())
-       except OSError, e:
-               pass
-
        if updatecache_flg and  \
                myaction != "metadata" and \
                "metadata-transfer" not in portage.settings.features:

diff --git a/pym/portage.py b/pym/portage.py
index c8c1570f842e6f767d5d6a843f284b9e7beba793..43fc3d8c5373ba15cf7dd33278cfd41221bf9504 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4533,7 +4533,7 @@ class vardbapi(dbapi):
                        if os.path.exists(newpath):
                                #dest already exists; keep this puppy where it is.
                                continue
-                       portage_exec.spawn((MOVE_BINARY, origpath, newpath), env=os.environ)
+                       os.rename(origpath, newpath)
 
                        # We need to rename the ebuild now.
                        old_eb_path = newpath+"/"+mycpsplit[1]    +"-"+mycpsplit[2]