summaryrefslogtreecommitdiffstats
path: root/pym/portage/util/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/portage/util/__init__.py')
-rw-r--r--pym/portage/util/__init__.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index 9542826b2..8ba6b6c81 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -656,8 +656,14 @@ def varexpand(mystring, mydict=None):
newstring=newstring+chr(0o11)
elif a=='v':
newstring=newstring+chr(0o13)
+ elif a in ('\'', '"'):
+ # Quote removal is handled by shlex.
+ newstring = newstring + mystring[pos-2:pos]
+ continue
elif a!='\n':
- #remove backslash only, as bash does: this takes care of \\ and \' and \" as well
+ # Remove backslash only, as bash does. This takes care
+ # of \\. Note that we don't handle quotes here since
+ # quote remoal is handled by shlex.
newstring=newstring+mystring[pos-1:pos]
continue
elif (mystring[pos]=="$") and (mystring[pos-1]!="\\"):