sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.spm] PortagePlugin: __source_env_get_var: return unicode, do not leak fds

Browse Source
This commit is contained in:
Fabio Erculiani
2012-05-05 08:49:26 +02:00
parent 67210c34ec
commit 6c4ecffcd7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py
View File

@@ -1193,12 +1193,15 @@ class PortagePlugin(SpmPlugin):
exec_path = os.path.join(dirname, "env_sourcer.sh")
args = [exec_path, env_file, env_var]
proc = subprocess.Popen(args, stdout = subprocess.PIPE)
sts = proc.wait()
if sts != 0:
raise IOError("cannot source %s and get %s" % (
env_file, env_var,))
output = proc.stdout.read().strip()
return output
try:
sts = proc.wait()
if sts != 0:
raise IOError("cannot source %s and get %s" % (
env_file, env_var,))
output = proc.stdout.read().strip()
finally:
proc.stdout.close()
return const_convert_to_unicode(output)
def __pkg_sources_filtering(self, sources):
sources.discard("->")