diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-10 12:05:38 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-10 12:05:38 -0800 |
| commit | cc567a89c6813341913055a8250c241fa737be84 (patch) | |
| tree | e3eccb54f2831e16532adbf281e9216246913fbb /pym/portage/package | |
| parent | 4735e8a0ef6e3182b05c9e9d0e27202d19db619a (diff) | |
| download | portage-cc567a89c6813341913055a8250c241fa737be84.tar.gz portage-cc567a89c6813341913055a8250c241fa737be84.tar.bz2 portage-cc567a89c6813341913055a8250c241fa737be84.zip | |
Use portage.shutil for safer unicode handling.
Diffstat (limited to 'pym/portage/package')
| -rw-r--r-- | pym/portage/package/ebuild/_spawn_nofetch.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 3 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/fetch.py | 3 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/prepare_build_dirs.py | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/pym/portage/package/ebuild/_spawn_nofetch.py b/pym/portage/package/ebuild/_spawn_nofetch.py index befdc89d4..bda1dc078 100644 --- a/pym/portage/package/ebuild/_spawn_nofetch.py +++ b/pym/portage/package/ebuild/_spawn_nofetch.py @@ -1,10 +1,10 @@ # Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -import shutil import tempfile from portage import os +from portage import shutil from portage.const import EBUILD_PHASES from portage.elog import elog_process from portage.package.ebuild.config import config diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 865ccd49d..37aead0f3 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -10,7 +10,6 @@ from itertools import chain import logging import os as _os import re -import shutil import signal import stat import sys @@ -31,7 +30,7 @@ portage.proxy.lazyimport.lazyimport(globals(), ) from portage import auxdbkeys, bsd_chflags, \ - eapi_is_supported, merge, os, selinux, \ + eapi_is_supported, merge, os, selinux, shutil, \ unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \ _shell_quote, _unicode_decode, _unicode_encode from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_ENV_DIR, \ diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py index 43597ac7d..70743bfb2 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -10,7 +10,6 @@ import io import logging import random import re -import shutil import stat import sys import tempfile @@ -24,7 +23,7 @@ portage.proxy.lazyimport.lazyimport(globals(), 'portage.package.ebuild.prepare_build_dirs:prepare_build_dirs', ) -from portage import OrderedDict, os, selinux, _encodings, \ +from portage import OrderedDict, os, selinux, shutil, _encodings, \ _shell_quote, _unicode_encode from portage.checksum import hashfunc_map, perform_md5, verify_all from portage.const import BASH_BINARY, CUSTOM_MIRRORS_FILE, \ diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py index 6de486acf..50b14ec91 100644 --- a/pym/portage/package/ebuild/prepare_build_dirs.py +++ b/pym/portage/package/ebuild/prepare_build_dirs.py @@ -5,12 +5,11 @@ __all__ = ['prepare_build_dirs'] import errno import gzip -import shutil import stat import time import portage -from portage import os, _encodings, _unicode_encode, _unicode_decode +from portage import os, shutil, _encodings, _unicode_encode, _unicode_decode from portage.data import portage_gid, portage_uid, secpass from portage.exception import DirectoryNotFound, FileNotFound, \ OperationNotPermitted, PermissionDenied, PortageException |