Merge lp:~spud/spud/add_option_fix into lp:spud

[Jon Hill]

Edited add_options routine as per patch in Bug #813431. This means a warning is no longer issued when an option is added via this routine.

[Patrick Farrell (pefarrell)]

a) libspud.py.ctypes is the old ctypes python interface, which is deprecated. The new one is in libspud.c (as this one can be used within the python interface in diamond). Admittedly, it doesn't say that anywhere ...

b) I think that the C, C++, Fortran and Python bindings should all be consistent. You've only changed the Python binding. Shouldn't we change the C++ layer so that it doesn't generate the error code in the first place?

[Jon Hill (jon-hill)]

Ah, ok. Didn't follow all the new files and what not.

[lp:~spud/spud/add_option_fix]

468. By Jon Hill on 2011-09-02

Trying again, but via fixing the cpp file. I think...

469. By Jon Hill on 2011-09-03

We dont need the new_key variable either

Unmerged revisions

469. By Jon Hill on 2011-09-03

We dont need the new_key variable either

468. By Jon Hill on 2011-09-02

Trying again, but via fixing the cpp file. I think...

467. By Jon Hill on 2011-09-02

Fix for bug #813431

=== modified file 'python/libspud.py.ctypes'
--- python/libspud.py.ctypes	2011-07-29 11:06:59 +0000
+++ python/libspud.py.ctypes	2011-09-03 07:54:23 +0000
@@ -207,7 +207,7 @@
   out = cadd_option(s, c_int(len(s)))
 
   if out != SPUD_NO_ERROR:
-    raise spud_exceptions[out]
+     raise spud_exceptions[out]
 
   return
 

=== modified file 'src/spud.cpp'
--- src/spud.cpp	2011-07-28 14:48:25 +0000
+++ src/spud.cpp	2011-09-03 07:54:23 +0000
@@ -333,13 +333,10 @@
   }
 
   OptionError OptionManager::add_option(const string& key){
-    logical_t new_key = !have_option(key);
 
     OptionError add_err = manager.options->add_option(key);
     if(add_err != SPUD_NO_ERROR){
       return add_err;
-    }else if(new_key){
-      return SPUD_NEW_KEY_WARNING;
     }
 
     return SPUD_NO_ERROR;