summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-08-25 14:48:45 -0700
committerZac Medico <zmedico@gentoo.org>2011-08-25 14:50:39 -0700
commit5a24743e55acedcbae06b97401c6e39b0d5faa98 (patch)
tree7b071530472d82551c1085ba10532e63e7f6eeec /bin
parent2aea972aa0c36531445172500ded32d7ddc07762 (diff)
downloadportage-5a24743e55acedcbae06b97401c6e39b0d5faa98.tar.gz
portage-5a24743e55acedcbae06b97401c6e39b0d5faa98.tar.bz2
portage-5a24743e55acedcbae06b97401c6e39b0d5faa98.zip
python3.2 fixes: ResourceWarning: unclosed file
Diffstat (limited to 'bin')
-rwxr-xr-xbin/repoman9
1 files changed, 7 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index 10f603ea2..e0494d95e 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1228,11 +1228,13 @@ for x in scanlist:
if not (y in ("ChangeLog", "metadata.xml") or y.endswith(".ebuild")):
continue
+ f = None
try:
line = 1
- for l in io.open(_unicode_encode(os.path.join(checkdir, y),
+ f = io.open(_unicode_encode(os.path.join(checkdir, y),
encoding=_encodings['fs'], errors='strict'),
- mode='r', encoding=_encodings['repo.content']):
+ mode='r', encoding=_encodings['repo.content'])
+ for l in f:
line +=1
except UnicodeDecodeError as ue:
stats["file.UTF8"] += 1
@@ -1242,6 +1244,9 @@ for x in scanlist:
if l2 != 0:
s = s[s.rfind("\n") + 1:]
fails["file.UTF8"].append("%s/%s: line %i, just after: '%s'" % (checkdir, y, line, s))
+ finally:
+ if f is not None:
+ f.close()
if vcs in ("git", "hg") and check_ebuild_notadded:
if vcs == "git":