| 1 |
Author: zmedico |
| 2 |
Date: 2010-03-01 05:02:23 +0000 (Mon, 01 Mar 2010) |
| 3 |
New Revision: 15508 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/package/ebuild/doebuild.py |
| 7 |
Log: |
| 8 |
Move imports to the top and use writemsg_stdout instead of print(). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/package/ebuild/doebuild.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/package/ebuild/doebuild.py 2010-03-01 04:56:44 UTC (rev 15507) |
| 14 |
+++ main/trunk/pym/portage/package/ebuild/doebuild.py 2010-03-01 05:02:23 UTC (rev 15508) |
| 15 |
@@ -2,19 +2,21 @@ |
| 16 |
# Distributed under the terms of the GNU General Public License v2 |
| 17 |
# $Id$ |
| 18 |
|
| 19 |
-from __future__ import print_function |
| 20 |
- |
| 21 |
__all__ = ['doebuild', 'doebuild_environment', 'spawn', 'spawnebuild'] |
| 22 |
|
| 23 |
+import array |
| 24 |
import codecs |
| 25 |
import errno |
| 26 |
+import fcntl |
| 27 |
from itertools import chain |
| 28 |
import logging |
| 29 |
import os as _os |
| 30 |
import re |
| 31 |
+import select |
| 32 |
import shutil |
| 33 |
import stat |
| 34 |
import sys |
| 35 |
+import tempfile |
| 36 |
from textwrap import wrap |
| 37 |
import time |
| 38 |
|
| 39 |
@@ -523,8 +525,7 @@ |
| 40 |
# so that there's no need for locking and it can be used even if the |
| 41 |
# user isn't in the portage group. |
| 42 |
if mydo in ("info",): |
| 43 |
- from tempfile import mkdtemp |
| 44 |
- tmpdir = mkdtemp() |
| 45 |
+ tmpdir = tempfile.mkdtemp() |
| 46 |
tmpdir_orig = mysettings["PORTAGE_TMPDIR"] |
| 47 |
mysettings["PORTAGE_TMPDIR"] = tmpdir |
| 48 |
|
| 49 |
@@ -620,8 +621,7 @@ |
| 50 |
noiselevel=-1) |
| 51 |
return 1 |
| 52 |
else: |
| 53 |
- from tempfile import NamedTemporaryFile |
| 54 |
- fd = NamedTemporaryFile(prefix="exectest-", dir=checkdir) |
| 55 |
+ fd = tempfile.NamedTemporaryFile(prefix="exectest-", dir=checkdir) |
| 56 |
os.chmod(fd.name, 0o755) |
| 57 |
if not os.access(fd.name, os.X_OK): |
| 58 |
writemsg(_("Can not execute files in %s\n" |
| 59 |
@@ -1002,7 +1002,7 @@ |
| 60 |
myebuild=mysettings["EBUILD"], mytree=tree, mydbapi=mydbapi, |
| 61 |
vartree=vartree, prev_mtimes=prev_mtimes) |
| 62 |
else: |
| 63 |
- print(_("!!! Unknown mydo: %s") % mydo) |
| 64 |
+ writemsg_stdout(_("!!! Unknown mydo: %s\n") % mydo, noiselevel=-1) |
| 65 |
return 1 |
| 66 |
|
| 67 |
return retval |
| 68 |
@@ -1188,7 +1188,6 @@ |
| 69 |
# process might have already exited and closed slave_fd so we |
| 70 |
# have to keep it open in order to avoid FreeBSD potentially |
| 71 |
# generating an EAGAIN exception). |
| 72 |
- import fcntl |
| 73 |
fcntl.fcntl(master_fd, fcntl.F_SETFL, |
| 74 |
fcntl.fcntl(master_fd, fcntl.F_GETFL) | os.O_NONBLOCK) |
| 75 |
|
| 76 |
@@ -1248,7 +1247,6 @@ |
| 77 |
iwtd = [master_file] |
| 78 |
owtd = [] |
| 79 |
ewtd = [] |
| 80 |
- import array, select |
| 81 |
buffsize = 65536 |
| 82 |
eof = False |
| 83 |
while not eof: |
Archives