params: rename helpStr to description.

alenz33 · Mar 20, 2015 · c5188eb · c5188eb
1 parent e13bd25
commit c5188eb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/conduct/buildsteps.py b/conduct/buildsteps.py
@@ -100,10 +100,10 @@ class BuildStep(object):
 
     parameters = {
         'description' : Parameter(type=str,
-                                  helpStr='Build step description',
+                                  description='Build step description',
                                   default='Undescribed'),
         'loglevel' : Parameter(type=oneof(LOGLEVELS.keys()),
-                               helpStr='Log level',
+                               description='Log level',
                                default='info'),
     }
 
@@ -163,9 +163,9 @@ def _initLogger(self):
 
 class CopyBS(BuildStep):
     parameters = {
-        'source' : Parameter(type=str, helpStr='Source to copy'),
-        'destination' : Parameter(type=str, helpStr='Destination of copy'),
-        'recursive' : Parameter(type=bool, helpStr='Copy directories recursively'),
+        'source' : Parameter(type=str, description='Source to copy'),
+        'destination' : Parameter(type=str, description='Destination of copy'),
+        'recursive' : Parameter(type=bool, description='Copy directories recursively'),
     }
 
     def run(self, args):

diff --git a/conduct/param.py b/conduct/param.py
@@ -33,9 +33,9 @@ class Parameter(object):
 
     No default means mandatory.
     '''
-    def __init__(self, type=str, helpStr='Undescribed', default=None):
+    def __init__(self, type=str, description='Undescribed', default=None):
         self.type = type
-        self.helpStr = helpStr,
+        self.description = description,
         self.default = default
 
         if default is not None:

diff --git a/etc/conduct.conf b/etc/conduct.conf
@@ -1,5 +1,6 @@
 [conduct]
 
-# logging
 logdir = /var/log/conduct
 loglevel = debug
+
+chaindir = etc/chains