Changeset 39466

Timestamp:

Mar 15, 2016, 9:20:17 AM (10 years ago)

Author:

eugene

Message:

add option for manual re-run without requesting confirmation (e.g., you know all dvo load_catalog jobs have completed)

Location:

trunk/Ohana/src/relastro

Files:

• include/relastro.h (modified) (1 diff)
• src/args.c (modified) (3 diffs)
• src/load_catalogs.c (modified) (1 diff)

trunk/Ohana/src/relastro/include/relastro.h

@@ -288 +288 @@
 int    PARALLEL_MANUAL;
 int    PARALLEL_SERIAL;
+int    PARALLEL_MANUAL_NO_WAIT;
 
 int    PARALLEL_OUTPUT;

trunk/Ohana/src/relastro/src/args.c

@@ -245 +245 @@
   // this is a test mode : rather than launching the remote jobs and waiting for completion,
   // relastro will simply list the remote command and wait for the user to signal completion
+  PARALLEL_MANUAL_NO_WAIT = FALSE;
   PARALLEL_MANUAL = FALSE;
   if ((N = get_argument (argc, argv, "-parallel-manual"))) {
@@ -250 +251 @@
     PARALLEL_MANUAL = TRUE;
     remove_argument (N, &argc, argv);
+    if ((N = get_argument (argc, argv, "-parallel-manual-nowait"))) {
+      PARALLEL_MANUAL_NO_WAIT = TRUE;
+      remove_argument (N, &argc, argv);
+    }
   }
   // this is a test mode : rather than launching the relastro_client jobs remotely, they are 
@@ -620 +625 @@
   PARALLEL = FALSE;
   PARALLEL_MANUAL = FALSE;
+  PARALLEL_MANUAL_NO_WAIT = FALSE;
   PARALLEL_SERIAL = FALSE;
 

trunk/Ohana/src/relastro/src/load_catalogs.c

@@ -253 +253 @@
   }
 
-  if (PARALLEL_MANUAL) {
+  if (PARALLEL_MANUAL && !PARALLEL_MANUAL_NO_WAIT) {
     fprintf (stderr, "run the relastro_client commands above.  when these are done, hit return\n");
     getchar();