launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Diff comments:

> === modified file 'lib/lp/archivepublisher/model/ftparchive.py'
> --- lib/lp/archivepublisher/model/ftparchive.py	2016-02-06 03:43:15 +0000
> +++ lib/lp/archivepublisher/model/ftparchive.py	2016-02-09 01:39:00 +0000
> @@ -754,17 +761,20 @@
>              distroseries.include_long_descriptions,
>              distroseries.index_compressors)
>  
> -        # XXX: 2006-08-24 kiko: Why do we do this directory creation here?
> +        # Make sure all the relevant directories exist and are empty.  Each
> +        # of these only contains files generated by apt-ftparchive, and may
> +        # contain files left over from previous configurations (e.g.
> +        # different compressor types).
>          for comp in comps:
>              component_path = os.path.join(
>                  self._config.distsroot, suite, comp)
> -            safe_mkdir(os.path.join(component_path, "source"))
> +            make_empty_dir(os.path.join(component_path, "source"))
>              if not distroseries.include_long_descriptions:
> -                safe_mkdir(os.path.join(component_path, "i18n"))
> +                make_empty_dir(os.path.join(component_path, "i18n"))
>              for arch in archs:
> -                safe_mkdir(os.path.join(component_path, "binary-" + arch))
> +                make_empty_dir(os.path.join(component_path, "binary-" + arch))
>                  for subcomp in self.publisher.subcomponents:
> -                    safe_mkdir(os.path.join(
> +                    make_empty_dir(os.path.join(
>                          component_path, subcomp, "binary-" + arch))

No, contents generation uses copies of the overrides and file lists, not of the generated indexes.  The directories in question here are in dists.in-progress, and nowadays that's kept strictly within the publisher, as anything else that tried to use it would necessarily be racing with the publisher.

>  
>      def writeAptConfig(self, apt_config, suite, comps, archs,


-- 
https://code.launchpad.net/~cjwatson/launchpad/ftparchive-cleanup-old-indexes/+merge/285428
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.