From fdf2337d583ef2374742783525ca98c4ad6a1af9 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Thu, 3 Jan 2008 18:56:57 +0000 Subject: [PATCH] Merged from trunk 9134:9137 | 9135 | Bug #204020 - Make grabfile() properly raise | | zmedico | PermissionDenied when appropriate instead of silently | | | ignoring permission errors. | | 9137 | Recognize export statements when filtering the environment. | | zmedico | This is needed for compatibility with environment.bz2 files | | | generated by paludis. | svn path=/main/branches/prefix/; revision=9139 --- bin/ebuild.sh | 2 +- pym/portage/util.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 0d596a8a8..ee16b8e48 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1451,7 +1451,7 @@ filter_readonly_variables() { done set +f var_grep=${var_grep:1} # strip the first | - var_grep="(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+)(${var_grep})=.*" + var_grep="(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+|^export[[:space:]]+)(${var_grep})=.*" # The sed is to remove the readonly attribute from variables such as those # listed in READONLY_EBUILD_METADATA, since having any readonly attributes # persisting in the saved environment can be inconvenient when it diff --git a/pym/portage/util.py b/pym/portage/util.py index db4611814..79f3c2f5d 100644 --- a/pym/portage/util.py +++ b/pym/portage/util.py @@ -281,7 +281,9 @@ def grablines(myfilename,recursive=0): myfile = open(myfilename, "r") mylines = myfile.readlines() myfile.close() - except IOError: + except IOError, e: + if e.errno == PermissionDenied.errno: + raise PermissionDenied(myfilename) pass return mylines -- 2.26.2