Merged from trunk 6503:6506

   +------------------------------------------------------------------------+
   | 6504      | For bug #177601, add a reference the --verbose option      |
   | zmedico   | documentation in the OUTPUT section.                       |
   |-----------+------------------------------------------------------------|
   | 6505      | For bug #177591, increase shell compatibility by           |
   | zmedico   | preserving quotes in varexpand() since quote removal is    |
   |           | handled by shlex.                                          |
   |-----------+------------------------------------------------------------|
   | 6506      | fix spacing in loaders                                     |
   | WarnerBro |                                                            |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6507

diff --git a/man/emerge.1 b/man/emerge.1
index ded52273e0ae7dbf3a8cf1c1d137051e2b527072..70f21459ad3ed55477d3be64f7eec87aecf8b684 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -467,7 +467,8 @@ built.  In this example, ipv6 optional support is enabled and both gtk and qt
 support are disabled.  The asterisk following ipv6 indicates that ipv6 support
 was disabled the last time this packages was installed.  The percent sign
 following qt indicates that the qt option has been added to the package since
-it was last installed.
+it was last installed.  For information about all \fBUSE\fR symbols, see the
+\fB\-\-verbose\fR option documentation above.
 .br
 \fB*Note:\fR Flags that haven't changed since the last install are only
 displayed when you use the \fB\-\-pretend\fR and \fB\-\-verbose\fR options.

diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py
index f670345a527977142c8b99df80eb6645ffb71ef1..3a2d7c2577d2a93d8d696d5fd7e06974d4063a40 100644 (file)
--- a/pym/portage/env/loaders.py
+++ b/pym/portage/env/loaders.py
@@ -105,7 +105,7 @@ class ItemFileLoader(DataLoader):
                                        % (line_num + 1, split))
                                        continue
                                data[key] = None
-               return (data,errors)
+               return (data, errors)
 
 class KeyListFileLoader(DataLoader):
        """
@@ -147,7 +147,7 @@ class KeyListFileLoader(DataLoader):
                                        data[key].append(value)
                                else:
                                        data[key] = value
-               return (data,errors)
+               return (data, errors)
 
 class KeyValuePairFileLoader(DataLoader):
        """
@@ -203,4 +203,4 @@ class KeyValuePairFileLoader(DataLoader):
                                        data[key].append(value)
                                else:
                                        data[key] = value
-               return (data,errors)
+               return (data, errors)

diff --git a/pym/portage/util.py b/pym/portage/util.py
index b54b991feb975147f0ed05619b0752a659a3b40d..bf1bbe9df8f3e6f1c83f3f8d657a7f51680c811c 100644 (file)
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -352,13 +352,13 @@ def getconfig(mycfg, tolerant=0, allow_sourcing=False, expand=True):
        
 #cache expansions of constant strings
 cexpand={}
-def varexpand(mystring,mydict={}):
+def varexpand(mystring, mydict={}):
        newstring = cexpand.get(" "+mystring, None)
        if newstring is not None:
                return newstring
 
        """
-       new variable expansion code.  Removes quotes, handles \n, etc.
+       new variable expansion code.  Preserves quotes, handles \n, etc.
        This code is used by the configfile code, as well as others (parser)
        This would be a good bunch of code to port to C.
        """
@@ -374,6 +374,7 @@ def varexpand(mystring,mydict={}):
                        if (indoub):
                                newstring=newstring+"'"
                        else:
+                               newstring += "'" # Quote removal is handled by shlex.
                                insing=not insing
                        pos=pos+1
                        continue
@@ -381,6 +382,7 @@ def varexpand(mystring,mydict={}):
                        if (insing):
                                newstring=newstring+'"'
                        else:
+                               newstring += '"' # Quote removal is handled by shlex.
                                indoub=not indoub
                        pos=pos+1
                        continue