Skip to content

Commit a5ae496

Browse files
authored
Do not detect package from deleted files (Azure#5253)
1 parent e760775 commit a5ae496

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

azure-sdk-tools/packaging_tools/drop_tools.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,11 @@ def build_package_from_pr_number(gh_token, sdk_id, pr_number, output_folder, *,
5151
con = Github(gh_token)
5252
repo = con.get_repo(sdk_id)
5353
sdk_pr = repo.get_pull(pr_number)
54+
files = [one_file.filename for one_file in sdk_pr.get_files() if one_file.status not in ['removed']]
5455
# "get_files" of Github only download the first 300 files. Might not be enough.
55-
package_names = {('.', f.filename.split('/')[0]) for f in sdk_pr.get_files() if f.filename.startswith("azure")}
56+
package_names = {('.', f.split('/')[0]) for f in files if f.startswith("azure")}
5657
# Handle the SDK folder as well
57-
matches = {_SDK_FOLDER_RE.search(f.filename) for f in sdk_pr.get_files()}
58+
matches = {_SDK_FOLDER_RE.search(f) for f in files}
5859
package_names.update({match.groups() for match in matches if match is not None})
5960

6061
absolute_output_folder = Path(output_folder).resolve()

azure-sdk-tools/packaging_tools/update_pr.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ def update_pr(gh_token, repo_id, pr_number):
2828
con = Github(gh_token)
2929
repo = con.get_repo(repo_id)
3030
sdk_pr = repo.get_pull(pr_number)
31+
files = [one_file.filename for one_file in sdk_pr.get_files() if one_file.status not in ['removed']]
3132
# "get_files" of Github only download the first 300 files. Might not be enough.
32-
package_names = {('.', f.filename.split('/')[0]) for f in sdk_pr.get_files() if f.filename.startswith("azure")}
33+
package_names = {('.', f.split('/')[0]) for f in files if f.startswith("azure")}
3334
# Handle the SDK folder as well
34-
matches = {_SDK_FOLDER_RE.search(f.filename) for f in sdk_pr.get_files()}
35+
matches = {_SDK_FOLDER_RE.search(f) for f in files}
3536
package_names.update({match.groups() for match in matches if match is not None})
3637

3738
# Get PR branch to push

0 commit comments

Comments
 (0)