[Git][debian-gis-team/nco][master] 2 commits: Add upstream patch to fix FTBFS with NetCDF 4.6.2-RC1.
Bas Couwenberg
gitlab at salsa.debian.org
Fri Sep 28 15:32:11 BST 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / nco
Commits:
8175395a by Bas Couwenberg at 2018-09-28T14:09:27Z
Add upstream patch to fix FTBFS with NetCDF 4.6.2-RC1.
- - - - -
9f4961ce by Bas Couwenberg at 2018-09-28T14:22:05Z
Set distribution to unstable.
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/0001-Convert-log_lvl-to-int-before-passing-to-nc_set_log_.patch
- + debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+nco (4.7.7-2) unstable; urgency=medium
+
+ * Add upstream patch to fix FTBFS with NetCDF 4.6.2-RC1.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 28 Sep 2018 16:21:57 +0200
+
nco (4.7.7-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/patches/0001-Convert-log_lvl-to-int-before-passing-to-nc_set_log_.patch
=====================================
@@ -0,0 +1,457 @@
+Description: Convert log_lvl to int before passing to nc_set_log_level() to fix breakage with netCDF 4.6.2-RC1
+Author: Charlie Zender <zender at uci.edu>
+Origin: https://github.com/nco/nco/commit/0152f68d948cb38d40c98abeecedcd5ac3e482f7
+
+--- a/configure.eg
++++ b/configure.eg
+@@ -373,7 +373,7 @@ scp nco.configure.${GNU_TRP}.foo nco.con
+ # Latest ticket: 216373 on 20180413
+ # Latest sysadmin-compiled module usage: module load netcdf/4.6.1 module load nco/4.7.4 # 20180417
+ # Personal recipe last modified: 20180427
+-# Personal recipe last used successfully: 20180811 (getopt errors were eliminated by removing ~/include/getopt*.h)
++# Personal recipe last used successfully: 20180921 (getopt errors were eliminated by removing ~/include/getopt*.h)
+ module purge
+ module load ncarenv intel ncarcompilers mpt netcdf
+ module add intel
+--- a/src/nco++/ncap2.cc
++++ b/src/nco++/ncap2.cc
+@@ -158,6 +158,7 @@ main(int argc,char **argv)
+ int idx;
+ int jdx;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_ass=int_CEWI;/* Number of dimensions in temporary list */
+ int nbr_dmn_in=int_CEWI; /* Number of dimensions in dim_in */
+@@ -407,7 +408,11 @@ main(int argc,char **argv)
+ nco_exit(EXIT_SUCCESS);
+ } /* endif "help" */
+ if(!strcmp(opt_crr,"hpss_try")) HPSS_TRY=True; /* [flg] Search HPSS for unfound files */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"lbr") || !strcmp(opt_crr,"library")){
+ (void)nco_lbr_vrs_prn();
+ nco_exit(EXIT_SUCCESS);
+--- a/src/nco/mpncbo.c
++++ b/src/nco/mpncbo.c
+@@ -155,6 +155,7 @@ main(int argc,char **argv)
+ int in_id_1;
+ int in_id_2;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl_1;
+ int nbr_dmn_fl_2;
+@@ -400,7 +401,11 @@ main(int argc,char **argv)
+ hdr_pad=strtoul(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
+ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtoul",sng_cnv_rcd);
+ } /* endif "hdr_pad" */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"msa_usr_rdr") || !strcmp(opt_crr,"msa_user_order")) MSA_USR_RDR=True; /* [flg] Multi-Slab Algorithm returns hyperslabs in user-specified order */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"create_ram") || !strcmp(opt_crr,"diskless_all")) RAM_CREATE=True; /* [flg] Open (netCDF3) file(s) in RAM */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"open_ram") || !strcmp(opt_crr,"diskless_all")) RAM_OPEN=True; /* [flg] Create file in RAM */
+--- a/src/nco/mpncecat.c
++++ b/src/nco/mpncecat.c
+@@ -119,6 +119,7 @@ main(int argc,char **argv)
+ int jdx;
+ int in_id;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl;
+ int nbr_dmn_xtr;
+@@ -355,7 +356,11 @@ main(int argc,char **argv)
+ hdr_pad=strtoul(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
+ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtoul",sng_cnv_rcd);
+ } /* endif "hdr_pad" */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"msa_usr_rdr") || !strcmp(opt_crr,"msa_user_order")) MSA_USR_RDR=True; /* [flg] Multi-Slab Algorithm returns hyperslabs in user-specified order */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"create_ram") || !strcmp(opt_crr,"diskless_all")) RAM_CREATE=True; /* [flg] Open (netCDF3) file(s) in RAM */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"open_ram") || !strcmp(opt_crr,"diskless_all")) RAM_OPEN=True; /* [flg] Create file in RAM */
+--- a/src/nco/mpncflint.c
++++ b/src/nco/mpncflint.c
+@@ -133,6 +133,7 @@ main(int argc,char **argv)
+ int in_id_1;
+ int in_id_2;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl;
+ int nbr_dmn_xtr;
+@@ -372,7 +373,11 @@ main(int argc,char **argv)
+ hdr_pad=strtoul(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
+ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtoul",sng_cnv_rcd);
+ } /* endif "hdr_pad" */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"create_ram") || !strcmp(opt_crr,"diskless_all")) RAM_CREATE=True; /* [flg] Open (netCDF3) file(s) in RAM */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"open_ram") || !strcmp(opt_crr,"diskless_all")) RAM_OPEN=True; /* [flg] Create file in RAM */
+ if(!strcmp(opt_crr,"vrs") || !strcmp(opt_crr,"version")){
+--- a/src/nco/mpncpdq.c
++++ b/src/nco/mpncpdq.c
+@@ -140,6 +140,7 @@ main(int argc,char **argv)
+ int idx_rdr=int_CEWI;
+ int in_id;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl;
+ int nbr_dmn_out;
+@@ -379,7 +380,11 @@ main(int argc,char **argv)
+ hdr_pad=strtoul(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
+ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtoul",sng_cnv_rcd);
+ } /* endif "hdr_pad" */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"create_ram") || !strcmp(opt_crr,"diskless_all")) RAM_CREATE=True; /* [flg] Open (netCDF3) file(s) in RAM */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"open_ram") || !strcmp(opt_crr,"diskless_all")) RAM_OPEN=True; /* [flg] Create file in RAM */
+ if(!strcmp(opt_crr,"vrs") || !strcmp(opt_crr,"version")){
+--- a/src/nco/mpncra.c
++++ b/src/nco/mpncra.c
+@@ -162,6 +162,7 @@ main(int argc,char **argv)
+ int idx=int_CEWI;
+ int in_id;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl;
+ int nbr_dmn_xtr;
+@@ -417,7 +418,11 @@ main(int argc,char **argv)
+ hdr_pad=strtoul(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
+ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtoul",sng_cnv_rcd);
+ } /* endif "hdr_pad" */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"create_ram") || !strcmp(opt_crr,"diskless_all")) RAM_CREATE=True; /* [flg] Open (netCDF3) file(s) in RAM */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"open_ram") || !strcmp(opt_crr,"diskless_all")) RAM_OPEN=True; /* [flg] Create file in RAM */
+ if(!strcmp(opt_crr,"vrs") || !strcmp(opt_crr,"version")){
+--- a/src/nco/mpncwa.c
++++ b/src/nco/mpncwa.c
+@@ -144,6 +144,7 @@ main(int argc,char **argv)
+ int idx_avg;
+ int in_id;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl;
+ int nbr_dmn_out=0;
+@@ -422,7 +423,11 @@ main(int argc,char **argv)
+ hdr_pad=strtoul(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
+ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtoul",sng_cnv_rcd);
+ } /* endif "hdr_pad" */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"create_ram") || !strcmp(opt_crr,"diskless_all")) RAM_CREATE=True; /* [flg] Open (netCDF3) file(s) in RAM */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"open_ram") || !strcmp(opt_crr,"diskless_all")) RAM_OPEN=True; /* [flg] Create file in RAM */
+ if(!strcmp(opt_crr,"vrs") || !strcmp(opt_crr,"version")){
+--- a/src/nco/ncatted.c
++++ b/src/nco/ncatted.c
+@@ -185,6 +185,7 @@ main(int argc,char **argv)
+ int nbr_aed=0; /* Option a. NB: nbr_var_aed gets incremented */
+ int nbr_var_fl;
+ int nc_id;
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int opt;
+ int rcd=NC_NOERR; /* [rcd] Return code */
+@@ -304,7 +305,11 @@ main(int argc,char **argv)
+ hdr_pad=strtoul(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
+ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtoul",sng_cnv_rcd);
+ } /* endif "hdr_pad" */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"open_ram") || !strcmp(opt_crr,"diskless_all")) RAM_OPEN=True; /* [flg] Create file in RAM */
+ if(!strcmp(opt_crr,"vrs") || !strcmp(opt_crr,"version")){
+ (void)nco_vrs_prn(CVS_Id,CVS_Revision);
+--- a/src/nco/ncbo.c
++++ b/src/nco/ncbo.c
+@@ -188,29 +188,29 @@ main(int argc,char **argv)
+ int in_id_1;
+ int in_id_2;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+-
+- int nbr_glb_att_1; /* [nbr] Number of global attributes in file */
+- int nbr_glb_att_2; /* [nbr] Number of global attributes in file */
+- int nbr_grp_att_1; /* [nbr] Number of group attributes in file */
+- int nbr_grp_att_2; /* [nbr] Number of group attributes in file */
+- int nbr_att_var_1; /* [nbr] Number of variable attributes in file */
+- int nbr_att_var_2; /* [nbr] Number of variable attributes in file */
+- int nbr_dmn_fl_1; /* [nbr] Number of dimensions in file */
+- int nbr_dmn_fl_2; /* [nbr] Number of dimensions in file */
+- int nbr_rec_fl_1; /* [nbr] Number of record dimensions in file */
+- int nbr_rec_fl_2; /* [nbr] Number of record dimensions in file */
+- int grp_dpt_fl_1; /* [nbr] Maximum group depth (root = 0) */
+- int grp_dpt_fl_2; /* [nbr] Maximum group depth (root = 0) */
++ int nbr_glb_att_1; /* [nbr] Number of global attributes in file */
++ int nbr_glb_att_2; /* [nbr] Number of global attributes in file */
++ int nbr_grp_att_1; /* [nbr] Number of group attributes in file */
++ int nbr_grp_att_2; /* [nbr] Number of group attributes in file */
++ int nbr_att_var_1; /* [nbr] Number of variable attributes in file */
++ int nbr_att_var_2; /* [nbr] Number of variable attributes in file */
++ int nbr_dmn_fl_1; /* [nbr] Number of dimensions in file */
++ int nbr_dmn_fl_2; /* [nbr] Number of dimensions in file */
++ int nbr_rec_fl_1; /* [nbr] Number of record dimensions in file */
++ int nbr_rec_fl_2; /* [nbr] Number of record dimensions in file */
++ int grp_dpt_fl_1; /* [nbr] Maximum group depth (root = 0) */
++ int grp_dpt_fl_2; /* [nbr] Maximum group depth (root = 0) */
+ int grp_lst_in_nbr=0; /* [nbr] Number of groups explicitly specified by user */
+- int nbr_grp_fl_1; /* [nbr] Number of groups in file */
+- int nbr_grp_fl_2; /* [nbr] Number of groups in file */
+- int var_udt_fl_1; /* [nbr] Number of non-atomic variables in file */
+- int var_udt_fl_2; /* [nbr] Number of non-atomic variables in file */
+- int nbr_var_fl_1; /* [nbr] Number of atomic-type variables in file */
+- int nbr_var_fl_2; /* [nbr] Number of atomic-type variables in file */
+- int nbr_gpe_nm; /* [nbr] Number of GPE entries */
+- int nbr_cmn_nm=0; /* [nbr] Number of common entries */
++ int nbr_grp_fl_1; /* [nbr] Number of groups in file */
++ int nbr_grp_fl_2; /* [nbr] Number of groups in file */
++ int var_udt_fl_1; /* [nbr] Number of non-atomic variables in file */
++ int var_udt_fl_2; /* [nbr] Number of non-atomic variables in file */
++ int nbr_var_fl_1; /* [nbr] Number of atomic-type variables in file */
++ int nbr_var_fl_2; /* [nbr] Number of atomic-type variables in file */
++ int nbr_gpe_nm; /* [nbr] Number of GPE entries */
++ int nbr_cmn_nm=0; /* [nbr] Number of common entries */
+ int nco_op_typ=nco_op_nil; /* [enm] Operation type */
+ int opt;
+ int out_id;
+@@ -447,7 +447,11 @@ main(int argc,char **argv)
+ nco_exit(EXIT_SUCCESS);
+ } /* endif "help" */
+ if(!strcmp(opt_crr,"hpss_try")) HPSS_TRY=True; /* [flg] Search HPSS for unfound files */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"msa_usr_rdr") || !strcmp(opt_crr,"msa_user_order")) MSA_USR_RDR=True; /* [flg] Multi-Slab Algorithm returns hyperslabs in user-specified order */
+ if(!strcmp(opt_crr,"ppc") || !strcmp(opt_crr,"precision_preserving_compression") || !strcmp(opt_crr,"quantize")){
+ ppc_arg[ppc_nbr]=(char *)strdup(optarg);
+--- a/src/nco/ncecat.c
++++ b/src/nco/ncecat.c
+@@ -188,6 +188,7 @@ main(int argc,char **argv)
+ int in_id;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
+ int lmt_nbr_rgn=0; /* Option d. Original limit number for GTT initialization */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl;
+ int nbr_var_fix; /* nbr_var_fix gets incremented */
+@@ -441,7 +442,11 @@ main(int argc,char **argv)
+ nco_exit(EXIT_SUCCESS);
+ } /* endif "help" */
+ if(!strcmp(opt_crr,"hpss_try")) HPSS_TRY=True; /* [flg] Search HPSS for unfound files */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"md5_dgs") || !strcmp(opt_crr,"md5_digest")){
+ if(!md5) md5=nco_md5_ini();
+ md5->dgs=True;
+--- a/src/nco/ncflint.c
++++ b/src/nco/ncflint.c
+@@ -186,6 +186,7 @@ main(int argc,char **argv)
+ int in_id_1;
+ int in_id_2;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl;
+ int nbr_ntp;
+@@ -441,7 +442,11 @@ main(int argc,char **argv)
+ nco_exit(EXIT_SUCCESS);
+ } /* endif "help" */
+ if(!strcmp(opt_crr,"hpss_try")) HPSS_TRY=True; /* [flg] Search HPSS for unfound files */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"msa_usr_rdr") || !strcmp(opt_crr,"msa_user_order")) MSA_USR_RDR=True; /* [flg] Multi-Slab Algorithm returns hyperslabs in user-specified order */
+ if(!strcmp(opt_crr,"ppc") || !strcmp(opt_crr,"precision_preserving_compression") || !strcmp(opt_crr,"quantize")){
+ ppc_arg[ppc_nbr]=(char *)strdup(optarg);
+--- a/src/nco/ncks.c
++++ b/src/nco/ncks.c
+@@ -207,6 +207,7 @@ main(int argc,char **argv)
+ int idx;
+ int in_id;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int opt;
+ int ppc_nbr=0; /* [nbr] Number of PPC arguments */
+@@ -677,7 +678,11 @@ main(int argc,char **argv)
+ nco_exit(EXIT_SUCCESS);
+ } /* endif "lbr" */
+ if(!strcmp(opt_crr,"lbr_rcd")) nco_exit_lbr_rcd();
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"lst_rnk_ge2") || !strcmp(opt_crr,"rank_ge2")) LST_RNK_GE2=True; /* [flg] Print extraction list of rank >= 2 variables */
+ if(!strcmp(opt_crr,"lst_xtr") || !strcmp(opt_crr,"xtr_lst")) LST_XTR=True; /* [flg] Print extraction list */
+ if(!strcmp(opt_crr,"mk_rec_dmn") || !strcmp(opt_crr,"mk_rec_dim")){
+--- a/src/nco/nco_rgr.c
++++ b/src/nco/nco_rgr.c
+@@ -730,6 +730,7 @@ nco_rgr_wgt /* [fnc] Regrid with externa
+ int fl_out_fmt=NCO_FORMAT_UNDEFINED; /* [enm] Output file format */
+ int fll_md_old; /* [enm] Old fill mode */
+ int in_id; /* I [id] Input netCDF file ID */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int out_id; /* I [id] Output netCDF file ID */
+ int rcd=NC_NOERR;
+@@ -5834,6 +5835,7 @@ nco_grd_nfr /* [fnc] Infer SCRIP-format
+ int dmn_idx; /* [idx] Dimension index */
+ int fl_out_fmt=NC_FORMAT_CLASSIC; /* [enm] Output file format */
+ int in_id; /* I [id] Input netCDF file ID */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int out_id; /* I [id] Output netCDF file ID */
+ int rcd=NC_NOERR;
+--- a/src/nco/ncpdq.c
++++ b/src/nco/ncpdq.c
+@@ -166,6 +166,7 @@ main(int argc,char **argv)
+ int idx_rdr=int_CEWI;
+ int in_id;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl;
+ int nbr_var_fix; /* nbr_var_fix gets incremented */
+@@ -446,7 +447,11 @@ main(int argc,char **argv)
+ nco_exit(EXIT_SUCCESS);
+ } /* endif "help" */
+ if(!strcmp(opt_crr,"hpss_try")) HPSS_TRY=True; /* [flg] Search HPSS for unfound files */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"mrd") || !strcmp(opt_crr,"multiple_record_dimension")) nco_mrd_cnv=nco_mrd_allow; /* [enm] Multiple Record Dimension convention */
+ if(!strcmp(opt_crr,"msa_usr_rdr") || !strcmp(opt_crr,"msa_user_order")) MSA_USR_RDR=True; /* [flg] Multi-Slab Algorithm returns hyperslabs in user-specified order */
+ if(!strcmp(opt_crr,"ppc") || !strcmp(opt_crr,"precision_preserving_compression") || !strcmp(opt_crr,"quantize")){
+@@ -461,7 +466,11 @@ main(int argc,char **argv)
+ nco_upk_cnv=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
+ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
+ } /* endif "hdr_pad" */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"vrs") || !strcmp(opt_crr,"version")){
+ (void)nco_vrs_prn(CVS_Id,CVS_Revision);
+ nco_exit(EXIT_SUCCESS);
+--- a/src/nco/ncra.c
++++ b/src/nco/ncra.c
+@@ -208,6 +208,7 @@ main(int argc,char **argv)
+ int idx_rec=0; /* [idx] Index that iterates over number of record dimensions */
+ int in_id;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl;
+ int nbr_dmn_xtr=0;
+@@ -563,7 +564,11 @@ main(int argc,char **argv)
+ nco_exit(EXIT_SUCCESS);
+ } /* endif "help" */
+ if(!strcmp(opt_crr,"hpss_try")) HPSS_TRY=True; /* [flg] Search HPSS for unfound files */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"md5_dgs") || !strcmp(opt_crr,"md5_digest")){
+ if(!md5) md5=nco_md5_ini();
+ md5->dgs=True;
+--- a/src/nco/ncrename.c
++++ b/src/nco/ncrename.c
+@@ -129,6 +129,7 @@ main(int argc,char **argv)
+ int mch_nbr_var=0; /* [nbr] Number of renamed variables */
+ int mch_nbr_grp=0; /* [nbr] Number of renamed groups */
+ int mch_nbr_dmn=0; /* [nbr] Number of renamed dimensions */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_att_rnm=0; /* Option a. NB: nbr_att_rnm gets incremented */
+ int nbr_dmn_rnm=0; /* Option d. NB: nbr_dmn_rnm gets incremented */
+@@ -257,7 +258,11 @@ main(int argc,char **argv)
+ hdr_pad=strtoul(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
+ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtoul",sng_cnv_rcd);
+ } /* endif "hdr_pad" */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"ram_all") || !strcmp(opt_crr,"open_ram") || !strcmp(opt_crr,"diskless_all")) RAM_OPEN=True; /* [flg] Create file in RAM */
+ if(!strcmp(opt_crr,"vrs") || !strcmp(opt_crr,"version")){
+ (void)nco_vrs_prn(CVS_Id,CVS_Revision);
+--- a/src/nco/ncwa.c
++++ b/src/nco/ncwa.c
+@@ -173,6 +173,7 @@ main(int argc,char **argv)
+ int idx=int_CEWI;
+ int in_id;
+ int lmt_nbr=0; /* Option d. NB: lmt_nbr gets incremented */
++ int log_lvl=0; /* [enm] netCDF library debugging verbosity [0..5] */
+ int md_open; /* [enm] Mode flag for nc_open() call */
+ int nbr_dmn_fl;
+ int nbr_dmn_out=0;
+@@ -490,7 +491,11 @@ main(int argc,char **argv)
+ nco_exit(EXIT_SUCCESS);
+ } /* endif "help" */
+ if(!strcmp(opt_crr,"hpss_try")) HPSS_TRY=True; /* [flg] Search HPSS for unfound files */
+- if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){nc_set_log_level(optarg);} /* [enm] netCDF library debugging verbosity [0..5] */
++ if(!strcmp(opt_crr,"log_lvl") || !strcmp(opt_crr,"log_level")){
++ log_lvl=(int)strtol(optarg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
++ if(*sng_cnv_rcd) nco_sng_cnv_err(optarg,"strtol",sng_cnv_rcd);
++ nc_set_log_level(log_lvl);
++ } /* !log_lvl */
+ if(!strcmp(opt_crr,"ppc") || !strcmp(opt_crr,"precision_preserving_compression") || !strcmp(opt_crr,"quantize")){
+ ppc_arg[ppc_nbr]=(char *)strdup(optarg);
+ ppc_nbr++;
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Convert-log_lvl-to-int-before-passing-to-nc_set_log_.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/nco/compare/e027585dfec9be4b7495f92b6afdee03c40de2bb...9f4961cea631307a6e6c282ef1b106f1fb8cca5f
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/nco/compare/e027585dfec9be4b7495f92b6afdee03c40de2bb...9f4961cea631307a6e6c282ef1b106f1fb8cca5f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180928/67a85aea/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list