[cmor] 87/190: 2011-02-02 : releasing 2.5.4 2011-02-02 : fixed a memory issue in the Python API for get_variable_attribute and has_variable_attribute
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit e6f572fec15c5c086f94f52379764ba63eaca0e0
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Wed Feb 2 11:02:10 2011 -0800
2011-02-02 : releasing 2.5.4
2011-02-02 : fixed a memory issue in the Python API for get_variable_attribute and has_variable_attribute
---
Lib/pywrapper.py | 2 ++
RELEASE-NOTES | 2 ++
Src/_cmormodule.c | 8 ++++----
configure | 18 +++++++++---------
configure.ac | 2 +-
include/cmor.h | 2 +-
6 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/Lib/pywrapper.py b/Lib/pywrapper.py
index 0529a30..8e7ada0 100644
--- a/Lib/pywrapper.py
+++ b/Lib/pywrapper.py
@@ -936,7 +936,9 @@ def get_variable_attribute(var_id,name):
name: is the name of the attribute
Returns none if attribute is non-existant
"""
+ print 'In there asking for attribute: ',name,'on var',var_id
if has_variable_attribute(var_id,name):
+ print 'Seems to have it',var_id,name
return _cmor.get_variable_attribute(var_id,name)
else:
return None
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f0fd1b5..a68f91b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,5 @@
+2011-02-02 : releasing 2.5.4
+2011-02-02 : fixed a memory issue in the Python API for get_variable_attribute and has_variable_attribute
2011-01-31 : releasing 2.5.3
2011-01-25 : path produced w/o '/' or weird characters
2011-01-25 : cannot set global attribute if it is an attribute that can be set via cmor_dataset
diff --git a/Src/_cmormodule.c b/Src/_cmormodule.c
index 3ff4bc1..64efa8f 100644
--- a/Src/_cmormodule.c
+++ b/Src/_cmormodule.c
@@ -90,10 +90,10 @@ static PyObject *
{
char *name;
char value[CMOR_MAX_STRING];
- int ierr, *var_id;
+ int ierr, var_id;
if (!PyArg_ParseTuple(args,"is",&var_id,&name))
return NULL;
- ierr = cmor_get_variable_attribute(*var_id,name,(void *)value);
+ ierr = cmor_get_variable_attribute(var_id,name,(void *)value);
if (ierr != 0 ) return NULL;
return Py_BuildValue("s",value);
}
@@ -102,10 +102,10 @@ static PyObject *
PyCMOR_has_variable_attribute(PyObject *self,PyObject *args)
{
char *name;
- int ierr, *var_id;
+ int ierr, var_id;
if (!PyArg_ParseTuple(args,"is",&var_id,&name))
return NULL;
- ierr = cmor_has_variable_attribute(*var_id,name);
+ ierr = cmor_has_variable_attribute(var_id,name);
return Py_BuildValue("i",ierr);
}
diff --git a/configure b/configure
index 4ff9a89..9bc782a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for cmor 2.5.3.
+# Generated by GNU Autoconf 2.61 for cmor 2.5.4.
#
# Report bugs to <doutriaux1 at llnl.gov>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='cmor'
PACKAGE_TARNAME='cmor'
-PACKAGE_VERSION='2.5.3'
-PACKAGE_STRING='cmor 2.5.3'
+PACKAGE_VERSION='2.5.4'
+PACKAGE_STRING='cmor 2.5.4'
PACKAGE_BUGREPORT='doutriaux1 at llnl.gov'
ac_default_prefix=/usr/local/cmor
@@ -1185,7 +1185,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures cmor 2.5.3 to adapt to many kinds of systems.
+\`configure' configures cmor 2.5.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1251,7 +1251,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cmor 2.5.3:";;
+ short | recursive ) echo "Configuration of cmor 2.5.4:";;
esac
cat <<\_ACEOF
@@ -1350,7 +1350,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cmor configure 2.5.3
+cmor configure 2.5.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1364,7 +1364,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cmor $as_me 2.5.3, which was
+It was created by cmor $as_me 2.5.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -4989,7 +4989,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by cmor $as_me 2.5.3, which was
+This file was extended by cmor $as_me 2.5.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5032,7 +5032,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-cmor config.status 2.5.3
+cmor config.status 2.5.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 221e0c4..1c4d11d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl -*- Autoconf -*-
dnl Process this file with autoconf to produce a configure script.
dnl AC_PREREQ(2.59)
-AC_INIT(cmor, 2.5.3, doutriaux1 at llnl.gov)
+AC_INIT(cmor, 2.5.4, doutriaux1 at llnl.gov)
GIT_TAG=`./get_git_version.sh`
diff --git a/include/cmor.h b/include/cmor.h
index a1719a6..d6d3edc 100644
--- a/include/cmor.h
+++ b/include/cmor.h
@@ -3,7 +3,7 @@
#define CMOR_VERSION_MAJOR 2
#define CMOR_VERSION_MINOR 5
-#define CMOR_VERSION_PATCH 3
+#define CMOR_VERSION_PATCH 4
#define CMOR_CF_VERSION_MAJOR 1
#define CMOR_CF_VERSION_MINOR 4
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list