summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2018-04-22 15:33:42 +0300
committerLars Wirzenius <liw@liw.fi>2018-04-22 15:33:42 +0300
commit7034d7339aa0797b59a83ae6cf18d1b566d19a3e (patch)
tree81cc044f12dc86d840db208d38115c598a18bb63
parentd03909ebc8f179b8231b9d3020cbce42fd34229d (diff)
downloadick2-7034d7339aa0797b59a83ae6cf18d1b566d19a3e.tar.gz
Change: populate_systree defaults to value os systree_name parameter
-rw-r--r--NEWS3
-rw-r--r--ick2/actions.py4
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ef1e078..7f0814e 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
Version 0.45+git, not yet released
----------------------------------
+* The `populate_systree` action now takes the name from the
+ `systree_name` parameter, if no `systree_name` field is given, or
+ its value is `auto`.
Version 0.45, released 2018-04-21
----------------------------------
diff --git a/ick2/actions.py b/ick2/actions.py
index 9f444e0..f48505f 100644
--- a/ick2/actions.py
+++ b/ick2/actions.py
@@ -264,8 +264,8 @@ class PopulateSystreeAction(Action): # pragma: no cover
def execute(self, params, step):
systree_name = step.get('systree_name')
- if not systree_name:
- return 1
+ if not systree_name or systree_name == 'auto':
+ systree_name = params['systree_name']
env = self.get_env()
systree_dir = env.get_systree_directory()