Issue #5352 - generate_static_pages cannot deal with directories being turned into regular pages

cms/bin/generate_static_pages.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 45 matching lines @@
     elif os.path.exists(partial_path) and not os.path.isdir(partial_path):
         raise Exception('The object at {} is not recognisable! It is neither '
                         'a file, nor a directory!'.format(partial_path))
 
     if not os.path.isdir(partial_path):
         os.mkdir(partial_path)
 
     if len(path_parts) == 0:
         return
 
-    resolve_dirs(os.path.join(partial_path, path_parts[0]), path_parts[1:])
+    ensure_dirs(os.path.join(partial_path, path_parts[0]), path_parts[1:])
 
 
 def is_in_previous_version(path, new_contents, encoding):
     """Test if a file we try to create already is in the output directory.
 
     It tests if the pre-existent file has all the expected content.
     It also handles the following two cases:
 
     1. The path is a directory - If this happens, it removes the directory from
     the file tree.
@@ skipping 42 matching lines @@
         encoding = None if binary else 'utf-8'
         outfile = os.path.join(output_dir, *path_parts)
         if outfile in known_files:
             logging.warning('File %s has multiple sources', outfile)
             return
         known_files.add(outfile)
 
         if is_in_previous_version(outfile, contents, encoding):
             return
 
-        resolve_dirs(output_dir, path_parts[:-1])
+        ensure_dirs(output_dir, path_parts[:-1])
 
         with codecs.open(outfile, 'wb', encoding=encoding) as handle:
             handle.write(contents)
 
     with create_source(repo, cached=True) as source:
         config = source.read_config()
         defaultlocale = config.get('general', 'defaultlocale')
         locales = list(source.list_locales())
         if defaultlocale not in locales:
             locales.append(defaultlocale)
@@ skipping 61 matching lines @@
                     os.rmdir(path)
     remove_unknown(output_dir)
 
 
 if __name__ == '__main__':
     parser = ArgumentParser('Convert website source to static website')
     parser.add_argument('source', help="Path to website's repository")
     parser.add_argument('output', help='Path to desired output directory')
     args = parser.parse_args()
     generate_pages(args.source, args.output)