Skip to content

Commit 414b967

Browse files
committed
Fix CI
1 parent edab959 commit 414b967

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

eng/tools/azure-sdk-tools/azpysdk/changelog.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,15 @@ def _resolve_package(package_arg: Optional[str]) -> Optional[str]:
198198
"""Resolve a package argument to a Chronus package name."""
199199
if not package_arg:
200200
return None
201-
# Resolve relative paths (e.g. ".") to absolute so get_package_from_repo
202-
# doesn't accidentally glob against the repo root.
203-
target = os.path.abspath(package_arg) if os.path.exists(package_arg) else package_arg
201+
path_like = (
202+
os.path.isabs(package_arg) or package_arg.startswith(".") or os.sep in package_arg or "/" in package_arg
203+
)
204+
if os.path.isabs(package_arg):
205+
target = os.path.abspath(package_arg)
206+
elif path_like:
207+
target = os.path.join(REPO_ROOT, package_arg)
208+
else:
209+
target = package_arg
204210
try:
205211
parsed = get_package_from_repo(target, REPO_ROOT)
206212
return parsed.name if parsed else package_arg

eng/tools/azure-sdk-tools/tests/test_changelog_commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ def test_explicit_path_resolves_name(self, mock_get_pkg):
303303
mock_get_pkg.return_value = SimpleNamespace(name="azure-core")
304304
result = changelog._resolve_package("sdk/core/azure-core")
305305
assert result == "azure-core"
306-
mock_get_pkg.assert_called_once_with(os.path.abspath("sdk/core/azure-core"), REPO_ROOT)
306+
mock_get_pkg.assert_called_once_with(os.path.join(REPO_ROOT, "sdk/core/azure-core"), REPO_ROOT)
307307

308308
@patch("azpysdk.changelog.get_package_from_repo")
309309
def test_bare_name_resolves(self, mock_get_pkg):

0 commit comments

Comments
 (0)