Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/cado-nfs/cado-nfs

scripts/cadofactor/README

@@ -6,13 +6,9 @@ All the parameters for the factorization are read from the parameter file,
 but it is possible to specify such parameters on the command line, after
 parameterfile.
 
-With the --old command line option, the script will translate parameter
-files written for the Perl script. It will still accept parameters in the
-new format, both in the file and on the command line.
-
 For example, running
 
-./cadofactor.py --old ../../params/params.c59 n=90377629292003121684002147101760858109247336549001090677693 wdir=/tmp/c59 bindir=$HOME/build/cado-nfs/normal
+./cadofactor.py ../../params/params.c59 N=90377629292003121684002147101760858109247336549001090677693 tasks.workdir=/tmp/c59 tasks.execpath=$HOME/build/cado-nfs/normal server.whitelist=0.0.0.0/0
 
 start the cadofactor script, which also starts the server. It does not start any clients with this command line, so those would have to be started manually:
 
@@ -23,12 +19,26 @@ You can start an arbitrary number of client scripts, on any machines that can co
 
 If you want to let the server automatically start clients, you need to supply a list of hostnames on which to start clients, e.g.,
 
-./cadofactor.py --old ../../params/params.c59 n=90377629292003121684002147101760858109247336549001090677693 wdir=/tmp/c59 bindir=$HOME/build/cado-nfs/normal slaves.hostnames=localhost slaves.nrclients=2 slaves.scriptpath=$HOME/git/cado-nfs/scripts/cadofactor
+./cadofactor.py ../../params/params.c59 N=90377629292003121684002147101760858109247336549001090677693 tasks.workdir=/tmp/c59 tasks.execpath=$HOME/build/cado-nfs/normal slaves.hostnames=localhost slaves.nrclients=2 slaves.scriptpath=$HOME/git/cado-nfs/scripts/cadofactor
 
 to let it start two clients on localhost. The scriptpath parameter must be the path to the directory on the client machine which contains wuclient2.py (and workunit.py).
 
 
-For more complex set-ups, it is preferable to write a parameter file in the new format. Some examples are in "parameters", "parameters.oar", and "parameters.rsa512.oar".
+Legacy parameter names with --old
+=================================
+
+With the --old command line option, the script will translate parameter
+files written for the Perl script. It will still accept parameters in the
+new format, both in the file and on the command line.
+
+For example, the two command lines above may be written instead as:
+
+./cadofactor.py --old ../../params/params.c59 n=90377629292003121684002147101760858109247336549001090677693 wdir=/tmp/c59 bindir=$HOME/build/cado-nfs/normal
+
+./cadofactor.py --old ../../params/params.c59 n=90377629292003121684002147101760858109247336549001090677693 wdir=/tmp/c59 bindir=$HOME/build/cado-nfs/normal slaves.hostnames=localhost slaves.nrclients=2 slaves.scriptpath=$HOME/git/cado-nfs/scripts/cadofactor
+
+
+For complex set-ups, it is preferable to write a parameter file in the new format. Some examples are in "parameters", "parameters.oar", and "parameters.rsa512.oar".
 
 The .oar parameter files are meant for cadofactor scripts that run *inside* an OAR submission, as they read the list of slave hostnames from the OAR node file.
 

scripts/cadofactor/wudb.py

@@ -827,7 +827,7 @@ class WuAccess(object): # {
             if callable(conn_close):
                 conn_close(self.conn)
             else:
-                self._conn.close()
+                self.conn.close()
     
     @staticmethod
     def to_str(wus):