Changeset 33415 for branches/meh_branches/ppstack_test/Ohana/src/relastro/src/relastro.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Ohana/src/relastro/src/relastro.c (modified) (1 diff)

branches/meh_branches/ppstack_test/Ohana/src/relastro/src/relastro.c

@@ -23 +23 @@
   if (FIT_TARGET == TARGET_HIGH_SPEED) {
     high_speed_catalogs ();
+    exit (0);
+  }
+
+  /* the object analysis is a separate process iterating over catalogs */
+  if (FIT_TARGET == TARGET_MERGE_SOURCE) {
+    relastro_merge_source ();
     exit (0);
   }