From 97aff5229912b2efd33ba45c6035f5d12eced8c3 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Wed, 20 Jul 2022 12:46:40 -0700 Subject: [PATCH] fix: [PHP] allow for explicit version_string (#1503) --- synthtool/languages/php.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/synthtool/languages/php.py b/synthtool/languages/php.py index 2e3a5ad68..025ba0263 100644 --- a/synthtool/languages/php.py +++ b/synthtool/languages/php.py @@ -83,6 +83,7 @@ def owlbot_copy_version( src: Path, dest: Path, copy_excludes: typing.Optional[typing.List[str]] = None, + version_string: str = None, ) -> None: """Copies files from a version subdirectory.""" logger.debug("owlbot_copy_version called from %s to %s", src, dest) @@ -95,8 +96,9 @@ def owlbot_copy_version( if not entries: logger.info("there is no src directory '%s' to copy", src_dir) return - version_string = os.path.basename(os.path.basename(next(entries))).lower() - logger.debug("version_string detected: %s", version_string) + if not version_string: + version_string = os.path.basename(os.path.basename(next(entries))).lower() + logger.debug("version_string detected: %s", version_string) # copy all src including partial veneer classes s.move([src / "src"], dest / "src", merge=_merge, excludes=copy_excludes)