diff options
| -rwxr-xr-x | bin/emerge | 5 | ||||
| -rw-r--r-- | pym/portage.py | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/bin/emerge b/bin/emerge index fd5eb7f07..3172fad5b 100755 --- 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 c8c1570f8..43fc3d8c5 100644 --- 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] |