curtin-dev team mailing list archive

[Michael Hudson-Doyle <mp+410267@xxxxxxxxxxxxxxxxxx>]

Pushed an update that has some docstrings and should generally be a bit more self-documenting.

This all doesn't work with old Pythons, probably shouldn't merge until we decide what to do about that. (There's nothing inherent here, it could all work fine on 2.7, I just don't want to have to avoid newer Python features forever)

Diff comments:

> diff --git a/curtin/commands/extract.py b/curtin/commands/extract.py
> index 069023f..d920d50 100644
> --- a/curtin/commands/extract.py
> +++ b/curtin/commands/extract.py
> @@ -186,21 +152,44 @@ def _get_image_stack(uri):
>      '''
>  
>      image_stack = []
> -    root_dir = os.path.dirname(uri)
>      img_name = os.path.basename(uri)
> -    _, img_ext = os.path.splitext(img_name)
> +    root_dir = uri[:-len(img_name)]
> +    img_base, img_ext = os.path.splitext(img_name)
>  
> -    img_parts = img_name.split('.')
> -    # Last item is the extension
> -    for i in img_parts[:-1]:
> +    if not img_base:
> +        return []
> +
> +    img_parts = img_base.split('.')
> +    for i in range(len(img_parts)):
>          image_stack.append(
> -            os.path.join(
> -                root_dir,
> -                '.'.join(img_parts[0:img_parts.index(i)+1]) + img_ext))
> +            root_dir + '.'.join(img_parts[0:i+1]) + img_ext)
>  
>      return image_stack
>  
>  
> +def get_image_handler_for_source(source):

Well I actually want to call get_image_hander_for_source in subiquity so yeah, explaining what its return value does probably makes sense.

> +    if source['uri'].startswith("cp://"):
> +        return TrivialImageHandler(source['uri'])
> +    elif source['type'] == "fsimage":
> +        return LayeredImageHandler([source['uri']])
> +    elif source['type'] == "fsimage-layered":
> +        return LayeredImageHandler(_get_image_stack(source['uri']))
> +    else:
> +        return None
> +
> +
> +def extract_source(source, target):
> +    handler = get_image_handler_for_source(source)
> +    if handler is not None:
> +        root_dir = handler.setup()
> +        try:
> +            copy_to_target(root_dir, target)
> +        finally:
> +            handler.cleanup()
> +    else:
> +        extract_root_tgz_url(source['uri'], target=target)
> +
> +
>  def copy_to_target(source, target):
>      if source.startswith("cp://"):
>          source = source[5:]


-- 
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/410267
Your team curtin developers is subscribed to branch curtin:master.