Index: trunk/pstamp/scripts/pstamp_get_image_job.pl
===================================================================
--- trunk/pstamp/scripts/pstamp_get_image_job.pl	(revision 30633)
+++ trunk/pstamp/scripts/pstamp_get_image_job.pl	(revision 30663)
@@ -87,7 +87,4 @@
 }
 
-my $outdir = dirname($output_base);
-my $prefix = basename($output_base) . "_";
-my $results_file = $output_base . ".bundle_results";
 
 # Look for programs we need
@@ -99,13 +96,16 @@
 }
 
+my $outdir = dirname($output_base);
+my $basename = basename($path_base);
+my $outroot = $output_base ."_" . $basename;
+my $results_file = $output_base . ".bundle_results";
+
 {
     my $command = "$dist_bundle --camera $camera --stage $stage --stage_id $stage_id";
-    $command .= " --component $component";
-    $command .= " --path_base $path_base --outdir $outdir --results_file $results_file";
-    $command .= " --prefix $prefix";
+    $command .= " --results_file $results_file";
+    $command .= " --component $component --path_base $path_base --outroot $outroot";
+#    XXX: we need to do some work if we want to support muggle bundles
+#    $command .= " --no_magic if $no_magic";
     $command .= " --magicked" if $magicked;
-    # DANGER DANGER do not commit next line
-#    $command .= " --no_magic";
-    # DANGER DANGER do not commit last line
     $command .= " --dbname $dbname" if $dbname;
     $command .= " --verbose" if $verbose;