[Checkins] SVN: zope.configuration/branches/chrism-dictactions/src/zope/configuration/xmlconfig.py fix bug with varname vs. literal string; fix includeOverrides

[Chris McDonough]

Log message for revision 123562:
  fix bug with varname vs. literal string; fix includeOverrides

Changed:
  U   zope.configuration/branches/chrism-dictactions/src/zope/configuration/xmlconfig.py

-=-
Modified: zope.configuration/branches/chrism-dictactions/src/zope/configuration/xmlconfig.py
===================================================================
--- zope.configuration/branches/chrism-dictactions/src/zope/configuration/xmlconfig.py	2011-12-02 17:15:49 UTC (rev 123561)
+++ zope.configuration/branches/chrism-dictactions/src/zope/configuration/xmlconfig.py	2011-12-02 17:54:28 UTC (rev 123562)
@@ -606,12 +606,11 @@
     # Now we'll grab the new actions, resolve conflicts,
     # and munge the includepath:
     newactions = []
+
     for action in config.resolveConflicts(_context.actions[nactions:]):
-        a = action.copy()
-        a[includepath] = includepath
-        newactions.append(a)
+        action['includepath'] = includepath
+        newactions.append(action)
 
-    # and replace the new actions with the munched new actions:
     _context.actions[nactions:] = newactions
 
 def registerCommonDirectives(context):