Changeset 28251

Timestamp:

Jun 7, 2010, 3:37:14 PM (16 years ago)

Author:

bills

Message:

merge in bug fix from trunk

Location:

tags/ipp-20100602/PS-IPP-PStamp

Files:

• . (modified) (1 prop)
• lib/PS/IPP/PStamp/Job.pm (modified) (3 diffs)

tags/ipp-20100602/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -475 +475 @@
     my $inverse = $option_mask & $PSTAMP_SELECT_INVERSE;
 
-    my $command = "$difftool -dbname $imagedb";
+    my $command = "$difftool -dbname $imagedb -pstamp_order";
     
     my $listrun = 0;
@@ -482 +482 @@
             $command .= " -diffskyfile -diff_id $id -skycell_id $skycell_id";
         } else {
+            $listrun = 1;
             $command .= " -listrun -diff_id $id";
-            $listrun = 1;
+            # the following is a work around for the problem reported in ticket #1394
+            # 'difftool -listrun returns multiple rows for stack-stack diffs'
+            $command .= " -limit 1";
         }
     } else {
@@ -492 +495 @@
 
     my $n = $output ? scalar @$output : 0;
-    if (!$listrun && ($n > 1)) {
+    if ($n > 1) {
         die ("difftool returned an unexpected number of diffskyfiles: $n");
     } elsif ($n == 0) {