[SCM] Sample data reduction pipeline branch, debian, updated. 18bd2af5aae85b7f488b472309c7ed8d6546e7d6

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 18bd2af5aae85b7f488b472309c7ed8d6546e7d6
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jun 29 15:20:09 2012 +0200

    Make the recipe a bit more robust

diff --git a/debian/patches/add_test_recipe.patch b/debian/patches/add_test_recipe.patch
index f20baf3..6567566 100644
--- a/debian/patches/add_test_recipe.patch
+++ b/debian/patches/add_test_recipe.patch
@@ -4,7 +4,7 @@ Description: This patch adds another recipe that is mainly used for the
  has more option parameter types, a "crash" option, and a "sleep" option.
 --- /dev/null
 +++ b/recipes/rtest.c
-@@ -0,0 +1,422 @@
+@@ -0,0 +1,420 @@
 +/* $Id: rtest.c,v 1.28 2007/07/30 07:08:59 llundin Exp $
 + *
 + * This file is part of the IIINSTRUMENT Pipeline
@@ -351,6 +351,8 @@ Description: This patch adds another recipe that is mainly used for the
 +    }
 +
 +    double qc_param = iiinstrument_pfits_get_dit(plist);
++    cpl_errorstate_set(prestate);
++
 +    cpl_propertylist_delete(plist);
 +
 +    /* - calibration input file */
@@ -367,10 +369,6 @@ Description: This patch adds another recipe that is mainly used for the
 +    /* Load raw image */
 +    cpl_image *image = cpl_image_load(cpl_frame_get_filename(rawframe),
 +				      CPL_TYPE_FLOAT, 0, 0);
-+    if (image == NULL) {
-+	return (int)cpl_error_set_message(cpl_func, cpl_error_get_code(),
-+				     "Could not load the image");
-+    }
 +
 +    /* Do some fake processing */
 +    usleep((unsigned int)(1e6*sleep_secs));

-- 
Sample data reduction pipeline