commit: 5808da4e04aabe18b8b14b5fa7ae1311e84f14aa
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 22 16:59:57 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jan 22 17:08:02 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5808da4e
portage/util/__init__.py: Fix typo in new_protect_filename() Bug 537298
Also fix missed rename from _os_merge to os, where os was defined to be
_os_merge.
---
pym/portage/util/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index 61fe787..9d1876f 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -1685,7 +1685,7 @@ def new_protect_filename(mydest, newmd5=None,
force=False):
old_pfile = normalize_path(os.path.join(real_dirname, last_pfile))
if last_pfile and newmd5:
try:
- old_pfile_st = _os_merge.lstat(old_pfile)
+ old_pfile_st = os.lstat(old_pfile)
except OSError as e:
if e.errno != errno.ENOENT:
raise
@@ -1694,7 +1694,7 @@ def new_protect_filename(mydest, newmd5=None,
force=False):
try:
# Read symlink target as bytes, in case
the
# target path has a bad encoding.
- pfile_link =
_os.readlink(_unicode_encode(old_pfile,
+ pfile_link =
os.readlink(_unicode_encode(old_pfile,
encoding=_encodings['merge'],
errors='strict'))
except OSError:
if e.errno != errno.ENOENT:
