Index: /trunk/ippScripts/scripts/dist_bundle.pl
===================================================================
--- /trunk/ippScripts/scripts/dist_bundle.pl	(revision 37076)
+++ /trunk/ippScripts/scripts/dist_bundle.pl	(revision 37077)
@@ -67,6 +67,4 @@
                       );
 my %empty_cleaned = ();
-
-
 
 # Look for programs we need
@@ -496,5 +494,5 @@
     } elsif ($stage eq "stack") {
         $type = $stack_cleaned{$rule};
-    } elsif ($stage eq "sky" or $stage eq 'skycal' or $stage eq 'stack_summary' or $stage eq 'ff') {
+    } elsif ($stage eq "sky" or $stage eq "skycal" or $stage eq "stack_summary" or $stage eq "ff") {
         $type = $empty_cleaned{$rule};
     } else {
Index: /trunk/ippScripts/scripts/ipp_apply_burntool_single.pl
===================================================================
--- /trunk/ippScripts/scripts/ipp_apply_burntool_single.pl	(revision 37076)
+++ /trunk/ippScripts/scripts/ipp_apply_burntool_single.pl	(revision 37077)
@@ -45,7 +45,10 @@
     defined $dbname;
 
-# unless (defined $camera) {
-#    $camera = "GPC1";
-# }
+# XXX watch out for TC3 and GPC2 here:
+unless (defined $camera) {
+    if ($this_uri =~ /ota/) {
+        $camera = "GPC1";
+    }
+ }
 
 my $missing_tools;
Index: /trunk/ippScripts/scripts/register_imfile.pl
===================================================================
--- /trunk/ippScripts/scripts/register_imfile.pl	(revision 37076)
+++ /trunk/ippScripts/scripts/register_imfile.pl	(revision 37077)
@@ -348,4 +348,7 @@
         $apply_command .= " --imfile_state $burntool_data->{imfile_state} ";
         $apply_command .= " --verbose " if $verbose;
+
+        # TEMPORARY
+        $apply_command .= " --camera GPC1";
         print "$apply_command\n";
         unless ($no_update) {
Index: /trunk/ippScripts/scripts/warp_skycell.pl
===================================================================
--- /trunk/ippScripts/scripts/warp_skycell.pl	(revision 37076)
+++ /trunk/ippScripts/scripts/warp_skycell.pl	(revision 37077)
@@ -413,5 +413,5 @@
                 unless ($success) {
                     $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                    warn("Unable to perform warptool -addwarped: $error_code\n");
+                    warn("Unable to perform warptool -tofullskyfile: $error_code\n");
                     exit($error_code) if $try >= 2;
                     sleep 10;