Clean up a bit.
authorZac Medico <zmedico@gentoo.org>
Fri, 13 Aug 2010 05:33:56 +0000 (22:33 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 13 Aug 2010 05:33:56 +0000 (22:33 -0700)
bin/ebuild-ipc.py

index 761e07a2ac4a8ad5f49c63545311c9a65219735d..0d673701acad9602a0417b56af1d94983ff3f1bf 100755 (executable)
@@ -41,12 +41,9 @@ class EbuildIpc(object):
                        portage.locks.unlockfile(lock_obj)
 
        def _communicate(self, args):
-               fifo_dir = os.environ['PORTAGE_BUILDDIR']
-               ipc_in_fifo = os.path.join(fifo_dir, '.ipc_in')
-               ipc_out_fifo = os.path.join(fifo_dir, '.ipc_out')
-               input_fd = os.open(ipc_out_fifo, os.O_RDONLY|os.O_NONBLOCK)
+               input_fd = os.open(self.ipc_out_fifo, os.O_RDONLY|os.O_NONBLOCK)
                input_file = os.fdopen(input_fd, 'rb')
-               output_file = open(ipc_in_fifo, 'wb')
+               output_file = open(self.ipc_in_fifo, 'wb')
                pickle.dump(args, output_file)
                output_file.flush()
 
@@ -61,7 +58,7 @@ class EbuildIpc(object):
                        portage.util.writemsg_stdout(out, noiselevel=-1)
 
                if err:
-                       portage.util.writemsg(out, noiselevel=-1)
+                       portage.util.writemsg(err, noiselevel=-1)
 
                return rval