[Checkins] SVN: GenericSetup/trunk/components.py Oops! the last change was mixed up

[Yvo Schubbe]

Log message for revision 78360:
  Oops! the last change was mixed up

Changed:
  U   GenericSetup/trunk/components.py

-=-
Modified: GenericSetup/trunk/components.py
===================================================================
--- GenericSetup/trunk/components.py	2007-07-26 17:45:46 UTC (rev 78359)
+++ GenericSetup/trunk/components.py	2007-07-26 17:46:20 UTC (rev 78360)
@@ -232,12 +232,11 @@
         logger.info("Can not register components, as no registry was found.")
         return
 
-    exporter = queryMultiAdapter((sm, context), IBody)
-    if exporter:
-        body = exporter.body
+    importer = queryMultiAdapter((sm, context), IBody)
+    if importer:
+        body = context.readDataFile('componentregistry.xml')
         if body is not None:
-            context.writeDataFile('componentregistry.xml', body,
-                                  exporter.mime_type)
+            importer.body = body
 
 def exportComponentRegistry(context):
     """Export local components.
@@ -248,8 +247,9 @@
         logger.info("Nothing to export.")
         return
 
-    importer = queryMultiAdapter((sm, context), IBody)
-    if importer:
-        body = context.readDataFile('componentregistry.xml')
+    exporter = queryMultiAdapter((sm, context), IBody)
+    if exporter:
+        body = exporter.body
         if body is not None:
-            importer.body = body
+            context.writeDataFile('componentregistry.xml', body,
+                                  exporter.mime_type)