diff options
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/actions.py | 7 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 62dadeec2..f6c2721fa 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -3,10 +3,6 @@ from __future__ import print_function -try: - from subprocess import getstatusoutput as subprocess_getstatusoutput -except ImportError: - from commands import getstatusoutput as subprocess_getstatusoutput import errno import logging import platform @@ -25,7 +21,7 @@ from itertools import chain import portage from portage import os -from portage import digraph +from portage import subprocess_getstatusoutput from portage import _unicode_decode from portage.cache.cache_errors import CacheError from portage.const import GLOBAL_CONFIG_PATH, NEWS_LIB_PATH @@ -44,6 +40,7 @@ from portage._sets import load_default_config, SETPREFIX from portage._sets.base import InternalPackageSet from portage.util import cmp_sort_key, writemsg, \ writemsg_level, writemsg_stdout +from portage.util.digraph import digraph from portage._global_updates import _global_updates from _emerge.clear_caches import clear_caches diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 21dea4035..42ce81069 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -9,10 +9,6 @@ import stat import sys import textwrap import platform -try: - from subprocess import getstatusoutput as subprocess_getstatusoutput -except ImportError: - from commands import getstatusoutput as subprocess_getstatusoutput import portage from portage import os from portage import _encodings @@ -162,7 +158,9 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval): raise del e processed_count += 1 - myso=subprocess_getstatusoutput("LANG=C LANGUAGE=C /usr/bin/install-info --dir-file="+inforoot+"/dir "+inforoot+"/"+x)[1] + myso = portage.subprocess_getstatusoutput( + "LANG=C LANGUAGE=C /usr/bin/install-info " + + "--dir-file=%s/dir %s/%s" % (inforoot, inforoot, x))[1] existsstr="already exists, for file `" if myso!="": if re.search(existsstr,myso): |