diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-08-26 08:43:02 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-08-26 08:43:02 -0700 |
| commit | 69a45726b314f4f859f4783f4a5a5927a3f36bf5 (patch) | |
| tree | 7b705c91d83f44397541995bad7a80eb6783746c /pym/portage | |
| parent | 8824df689066c24214322f8f13f39d56105bea7f (diff) | |
| download | portage-69a45726b314f4f859f4783f4a5a5927a3f36bf5.tar.gz portage-69a45726b314f4f859f4783f4a5a5927a3f36bf5.tar.bz2 portage-69a45726b314f4f859f4783f4a5a5927a3f36bf5.zip | |
python3.2 fixes: ResourceWarning: unclosed file
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/tests/repoman/test_simple.py | 4 | ||||
| -rw-r--r-- | pym/portage/util/_dyn_libs/LinkageMapELF.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py index 612ff8e77..b987f296f 100644 --- a/pym/portage/tests/repoman/test_simple.py +++ b/pym/portage/tests/repoman/test_simple.py @@ -154,7 +154,9 @@ class SimpleRepomanTestCase(TestCase): os.path.join(PORTAGE_BIN_PATH, "repoman"), "full"], cwd=cwd, env=env, stdout=subprocess.PIPE) output = proc.stdout.readlines() - if proc.wait() != os.EX_OK: + proc.wait() + proc.stdout.close() + if proc.returncode != os.EX_OK: for line in output: sys.stderr.write(_unicode_decode(line)) diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py index 52670d98d..f7513573d 100644 --- a/pym/portage/util/_dyn_libs/LinkageMapELF.py +++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py @@ -267,6 +267,7 @@ class LinkageMapELF(object): owner = plibs.pop(fields[1], None) lines.append((owner, "scanelf", ";".join(fields))) proc.wait() + proc.stdout.close() if plibs: # Preserved libraries that did not appear in the scanelf output. |