[cmor] 179/190: refresh patch

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit ce36eb2905b71013490ce69cf34dea66c0dda394
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Dec 20 01:45:03 2013 +0000

    refresh patch
---
 debian/patches/silence-warning.patch | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/patches/silence-warning.patch b/debian/patches/silence-warning.patch
index 583eb77..eefaf5c 100644
--- a/debian/patches/silence-warning.patch
+++ b/debian/patches/silence-warning.patch
@@ -1,15 +1,17 @@
 Index: cmor-2.8.3/Lib/__init__.py
 ===================================================================
---- cmor-2.8.3.orig/Lib/__init__.py	2013-06-13 15:09:42.000000000 +0100
-+++ cmor-2.8.3/Lib/__init__.py	2013-06-13 15:13:27.000000000 +0100
-@@ -4,6 +4,10 @@
+--- cmor-2.8.3.orig/Lib/__init__.py	2013-12-20 01:43:03.000000000 +0000
++++ cmor-2.8.3/Lib/__init__.py	2013-12-20 01:44:43.000000000 +0000
+@@ -3,7 +3,11 @@
+ from pywrapper import axis,variable,write,setup,load_table,dataset,set_table,zfactor,close,grid,set_grid_mapping,time_varying_grid_coordinate,set_cur_dataset_attribute,get_cur_dataset_attribute,has_cur_dataset_attribute,create_output_path,set_variable_attribute,get_variable_attribute,has_variable_attribute
  
  try:
-   from .check_CMOR_compliant import checkCMOR
+-  from check_CMOR_compliant import checkCMOR
++   from check_CMOR_compliant import checkCMOR
 +except ImportError as e:
-+  if e == 'No module named cdms2':
-+     print("Warning: cdms2 module not found")
-+     pass
- except Exception as err:
-   print(err)
++   if e == 'No module named cdms2':
++      print("Warning: cdms2 module not found")
++      pass
+ except Exception,err:
+   print err
    pass

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git