curtin-dev team mailing list archive

[Dan Bungert <mp+450288@xxxxxxxxxxxxxxxxxx>]

Diff comments:

> diff --git a/curtin/distro.py b/curtin/distro.py
> index 433004c..0f7e45b 100644
> --- a/curtin/distro.py
> +++ b/curtin/distro.py
> @@ -229,14 +229,7 @@ def apt_update(target=None, env=None, force=False, comment=None,
>  
>      restore_perms = []
>  
> -    abs_tmpdir = tempfile.mkdtemp(dir=target_path(target, "/tmp"))

the "marker" lines are still in place, and look at *.list files only.  Either we update that to also look at *.sources or drop it.

>      try:
> -        abs_slist = abs_tmpdir + "/sources.list"
> -        abs_slistd = abs_tmpdir + "/sources.list.d"
> -        ch_tmpdir = "/tmp/" + os.path.basename(abs_tmpdir)
> -        ch_slist = ch_tmpdir + "/sources.list"
> -        ch_slistd = ch_tmpdir + "/sources.list.d"
> -
>          # this file gets executed on apt-get update sometimes. (LP: #1527710)
>          motd_update = target_path(
>              target, "/usr/lib/update-notifier/update-motd-updates-available")


-- 
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/450288
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:simplify-apt_update into curtin:master.