Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

2 files changed, 9 insertions, 21 deletions

diff --git a/buildscripts/patch_builds/change_data.py b/buildscripts/patch_builds/change_data.py
index 0d7fee88496..44af0fca70b 100644
--- a/buildscripts/patch_builds/change_data.py
+++ b/buildscripts/patch_builds/change_data.py
@@ -87,7 +87,7 @@ def find_changed_files(repo: Repo, revision_map: Optional[RevisionMap] = None) -
     work_tree_files = _modified_files_for_diff(diff, LOGGER.bind(diff="working tree diff"))
 
     commit = repo.index
-    diff = commit.diff(revision_map.get(repo.git_dir, repo.head.commit), R=True)
+    diff = commit.diff(revision_map.get(repo.git_dir, repo.head.commit))
     index_files = _modified_files_for_diff(diff, LOGGER.bind(diff="index diff"))
 
     untracked_files = set(repo.untracked_files)
diff --git a/buildscripts/patch_builds/evg_change_data.py b/buildscripts/patch_builds/evg_change_data.py
index 6ee3ebb7ca7..4506defa203 100644
--- a/buildscripts/patch_builds/evg_change_data.py
+++ b/buildscripts/patch_builds/evg_change_data.py
@@ -2,9 +2,6 @@
 from typing import List
 
 from git import Repo
-from requests import HTTPError
-import yaml
-
 from evergreen import EvergreenApi
 
 from buildscripts.patch_builds.change_data import RevisionMap, generate_revision_map
@@ -20,20 +17,11 @@ def generate_revision_map_from_manifest(repos: List[Repo], task_id: str,
     :param evg_api: Evergreen API object.
     :return: Map of repositories to revisions
     """
-    try:
-        manifest = evg_api.manifest_for_task(task_id)
-        revisions_data = {
-            module_name: module.revision
-            for module_name, module in manifest.modules.items()
-        }
-        revisions_data["mongo"] = manifest.revision
-        return generate_revision_map(repos, revisions_data)
-    except HTTPError as err:
-        # Manifest unavailable from Evergreen? Just make a fake one:
-        if err.response.status_code == 404:
-            with open("../expansions.yml") as file_handle:
-                return generate_revision_map(repos,
-                                             {"mongo": yaml.safe_load(file_handle)["revision"]})
-        # Some other Evergreen error? Raise it up the stack!
-        else:
-            raise err
+    manifest = evg_api.manifest_for_task(task_id)
+    revisions_data = {
+        module_name: module.revision
+        for module_name, module in manifest.modules.items()
+    }
+    revisions_data["mongo"] = manifest.revision
+
+    return generate_revision_map(repos, revisions_data)