Changeset 30113

Timestamp:

Dec 18, 2010, 8:47:39 AM (15 years ago)

Author:

watersc1

Message:

Fix register_imfile.pl/regtool failures due to an incomplete regtool call when that call isn't actually needed.

File:

• trunk/ippScripts/scripts/register_imfile.pl (modified) (2 diffs)

trunk/ippScripts/scripts/register_imfile.pl

@@ -287 +287 @@
     if ($burntool_data->{burnable} == 0) {
         $regtool_update .= " -burntool_state 0 -set_state pending_burntool ";
+        unless ($no_update) {
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                IPC::Cmd::run(command => $regtool_update, verbose => $verbose);
+            unless ($success) {
+                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                warn ("Unable to perform regtool -addprocessedimfile: $error_code");
+                exit($error_code);
+            }
+        } else {
+            print "skipping command: $command\n";
+        }
     }
     else {
@@ -296 +307 @@
         $apply_command .= " --verbose " if $verbose;
         print "$apply_command\n";
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            IPC::Cmd::run(command => $apply_command, verbose => $verbose);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            warn ("Unable to perform ipp_apply_burntool_single.pl: $error_code");
-            exit($error_code);
+        unless ($no_update) {
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                IPC::Cmd::run(command => $apply_command, verbose => $verbose);
+            unless ($success) {
+                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                warn ("Unable to perform ipp_apply_burntool_single.pl: $error_code");
+                exit($error_code);
+            }
         }
     }    
 
-    unless ($no_update) {
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            IPC::Cmd::run(command => $regtool_update, verbose => $verbose);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            warn ("Unable to perform regtool -addprocessedimfile: $error_code");
-            exit($error_code);
-        }
-    } else {
-        print "skipping command: $command\n";
-    }
 
 }