Create copy for all options in ITERATE_OPTS-iterate_opts

This way each iteration will start from the original copy of
configopts etc, as it's in the iter_opts dict.

Author: bartoldeman

easybuild/framework/easyblock.py

@@ -2378,24 +2378,21 @@ def handle_iterate_opts(self):
             # handle configure/build/install options that are specified as lists (+ perhaps builddependencies)
             # set first element to be used, keep track of list in self.iter_opts
             # only needs to be done during first iteration, since after that the options won't be lists anymore
-            if self.iter_idx == 0:
+            if self.iter_idx == 0 and self.det_iter_cnt() > 1:
                 # keep track of list, supply first element as first option to handle
-                iter_cnt = self.det_iter_cnt()
-                for opt in self.cfg.iterate_options:
-                    if isinstance(self.cfg[opt], (list, tuple)):
-                        self.iter_opts[opt] = self.cfg[opt]  # copy
-                    elif iter_cnt > 1:
-                        # make iter_cnt copies for every opt since easyblocks can modify them
-                        self.iter_opts[opt] = [self.cfg[opt]] * iter_cnt
-                    self.log.debug("Found list for %s: %s", opt, self.iter_opts[opt])
+                for opt in self.cfg.ITERATE_OPTIONS:
+                    self.iter_opts[opt] = self.cfg[opt]  # copy
+                    self.log.debug("Iterating opt %s: %s", opt, self.iter_opts[opt])
 
             if self.iter_opts:
                 print_msg("starting iteration #%s ..." % self.iter_idx, log=self.log, silent=self.silent)
                 self.log.info("Current iteration index: %s", self.iter_idx)
 
             # pop first element from all iterative easyconfig parameters as next value to use
             for opt, value in self.iter_opts.items():
-                if len(value) > self.iter_idx:
+                if opt not in self.cfg.iterate_options:
+                    self.cfg[opt] = value
+                elif len(value) > self.iter_idx:
                     self.cfg[opt] = value[self.iter_idx]
                 else:
                     self.cfg[opt] = ''  # empty list => empty option as next value

easybuild/framework/easyconfig/easyconfig.py

@@ -1037,8 +1037,14 @@ def validate_iterate_opts_lists(self):
     def start_iterating(self):
         """Start iterative mode."""
 
-        # builddependencies is already handled, see __init__
-        self.iterate_options.extend([opt for opt in ITERATE_OPTIONS if opt != 'builddependencies'])
+        for opt in ITERATE_OPTIONS:
+            # builddpendencies is already handled, see __init__
+            if opt == 'builddependencies':
+                continue
+
+            # list of values indicates that this is a value to iterate over
+            if isinstance(self[opt], (list, tuple)):
+                self.iterate_options.append(opt)
 
         # keep track of when we're iterating (used by builddependencies())
         self.iterating = True