Changeset 1295 for trunk

Timestamp:

Nov 23, 2008, 12:02:27 PM (17 years ago)

Author:

John Small

Message:

ReleaseTool/Edit: 1) Improved handling of missing or invalid trace option
parameter; 2) (ReleaseEdit) Ignore 'NOTREADY' condition on closing the
repository file.

Location:

trunk

Files:

• ReleaseEdit.cmd (modified) (5 diffs)
• ReleaseTool.cmd (modified) (2 diffs)

trunk/ReleaseEdit.cmd

@@ -42 +42 @@
  *       - Improved "usage" routine
  *       - Suppressed output of 'del' commands
+ *    23 Nov 08 JBS Improved handling of invalid or missing <trace-option>
+ *       and a 'NOTREADY' condition when closing the repository.
  *
 */
 
 n = setlocal()
+
+/*
+   sed_separator:
+     - used only for SED edits of DEF file descriptions
+     - MUST be a character not found in ANY DEF file description!
+     - MUST be a character acceptable to SED as a separator
+*/
+sed_separator = '&'
+
+call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
+call SysLoadFuncs
 
 parse arg args
@@ -57 +70 @@
          if verify(translate(traceopt), '?ACEFILNOR') = 0 & length(traceopt) < 3 then
             trace value traceopt
+         else
+            call Usage
+      else
+         do
+            parse source . called_as .
+            if called_as = 'COMMAND' then
+               call Usage
+            else
+               nop /* traceopt = '' OK for ReleaseEdit because it is usually called from ReleaseTool? */
+         end
    end
+else
+   traceopt = ''
 
 signal on Error
@@ -68 +93 @@
 signal on novalue             /* for debugging */
 */
-/*
-   sed_separator:
-     - used only for SED edits of DEF file descriptions
-     - MUST be a character not found in ANY DEF file description!
-     - MUST be a character acceptable to SED as a separator
-*/
-sed_separator = '&'
 
 /* Change to proper directory */
@@ -99 +117 @@
 
 /* Prepare temporary file */
-call RxFuncAdd 'SysTempFilename', 'REXXUTIL', 'SysTempFilename'
 tmpfile = SysTempFilename('redittmp.???')
 '@copy' file tmpfile '1>nul 2>nul'
@@ -147 +164 @@
          fixpack_ver    = GetFromRepository( 'fixpack_ver', '', 11 )
          description    = GetFromRepository( 'desc.' || left(file, pos('.', file) - 1), '', 579 /* i.e. disable length check */ )
+         signal off NOTREADY
          call stream repository, 'c', 'close'
+         signal on NOTREADY name Error
 
          option_description = '@#' || vendor || ':' || revision || '#@##1## ' || ,

trunk/ReleaseTool.cmd

@@ -36 +36 @@
  *       - Support for EDITOR env var
  *       - Improved "usage" routine
+ *    23 Nov 08 JBS Improved handling of invalid or missing <trace-option>
  *
 */
@@ -64 +65 @@
          if verify(translate(traceopt), '?ACEFILNOR') = 0 & length(traceopt) < 3 then
             trace value traceopt
+         else
+            call Usage
+      else
+         do
+            parse source . called_as .
+            if called_as = 'COMMAND' then
+               call Usage
+            else
+               nop /* traceopt = '' OK for ReleaseEdit because it is usually called from ReleaseTool? */
+         end
    end
 else