@@ -414,7 +414,7 @@ def new_module(self, name):
414
414
name = self .add_namespace (name )
415
415
416
416
module = Module (name )
417
-
417
+
418
418
# Pass on container and settings
419
419
module .container = self .container
420
420
module .settings = self .settings
@@ -450,18 +450,18 @@ def install(
450
450
"force" is currently not used.
451
451
"""
452
452
# Create a new module
453
- module = kwargs .get ("module" ) or self .get_module (
453
+ module = kwargs .get ("module" ) or self .get_module (
454
454
name , container_image = container_image , keep_path = keep_path
455
455
)
456
456
457
457
# We always load overrides for an install
458
458
module .load_override_file ()
459
459
460
460
# Create the module and container directory
461
- if self .settings .version_naming :
462
- utils .mkdirp ([os .path .dirname (module .module_dir ), module .container_dir ])
463
- else :
464
- utils .mkdirp ([module .module_dir , module .container_dir ])
461
+ if self .settings .version_naming :
462
+ utils .mkdirp ([os .path .dirname (module .module_dir ), module .container_dir ])
463
+ else :
464
+ utils .mkdirp ([module .module_dir , module .container_dir ])
465
465
466
466
# Add a .version file to indicate the level of versioning
467
467
self .versionfile .write (
@@ -474,16 +474,18 @@ def install(
474
474
# Get the template based on the module and container type
475
475
template = self .template .load (self .templatefile )
476
476
if self .settings .version_naming :
477
- self ._modulefile = name .split (":" )[1 ]
478
- module ._module_dir = os .path .dirname (module .module_dir )
479
- module_path = os .path .join (os .path .dirname (module .module_dir ),self ._modulefile )
480
- else :
481
- module_path = os .path .join (module .module_dir , self .modulefile )
477
+ self ._modulefile = name .split (":" )[1 ]
478
+ module ._module_dir = os .path .dirname (module .module_dir )
479
+ module_path = os .path .join (
480
+ os .path .dirname (module .module_dir ), self ._modulefile
481
+ )
482
+ else :
483
+ module_path = os .path .join (module .module_dir , self .modulefile )
482
484
483
485
# Install the container
484
486
# This could be simplified to take the module
485
487
self .container .install (module_path , template , module , kwargs .get ("features" ))
486
-
488
+
487
489
# If the container tech does not need storage, clean up
488
490
if not os .listdir (module .container_dir ):
489
491
utils .remove_to_base (module .container_dir , self .container_base )
0 commit comments