Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-23 16:47:57 +01:00
Code Issues Projects Releases Wiki Activity

Accept change as proposed by black. (#2055)

Browse Source
This commit is contained in:
Maurice Makaay 2021-07-22 14:37:42 +02:00 committed by GitHub
parent acbb8e9fd0
commit 80949521b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/components/external_components/__init__.py
View File

@ -109,9 +109,9 @@ def _compute_destination_path(key: str) -> Path:
return base_dir / h.hexdigest()[:8] return base_dir / h.hexdigest()[:8]
def _run_git_command(cmd): def _run_git_command(cmd, cwd=None):
try: try:
ret = subprocess.run(cmd, capture_output=True, check=False) ret = subprocess.run(cmd, cwd=cwd, capture_output=True, check=False)
except FileNotFoundError as err: except FileNotFoundError as err:
raise cv.Invalid( raise cv.Invalid(
"git is not installed but required for external_components.\n" "git is not installed but required for external_components.\n"
@ -151,14 +151,16 @@ def _process_git_config(config: dict, refresh) -> str:
_LOGGER.info("Updating %s", key) _LOGGER.info("Updating %s", key)
_LOGGER.debug("Location: %s", repo_dir) _LOGGER.debug("Location: %s", repo_dir)
# Stash local changes (if any) # Stash local changes (if any)
_run_git_command(["git", "stash", "push", "--include-untracked"]) _run_git_command(
["git", "stash", "push", "--include-untracked"], str(repo_dir)
)
# Fetch remote ref # Fetch remote ref
cmd = ["git", "fetch", "--", "origin"] cmd = ["git", "fetch", "--", "origin"]
if CONF_REF in config: if CONF_REF in config:
cmd.append(config[CONF_REF]) cmd.append(config[CONF_REF])
_run_git_command(cmd) _run_git_command(cmd, str(repo_dir))
# Hard reset to FETCH_HEAD (short-lived git ref corresponding to most recent fetch) # Hard reset to FETCH_HEAD (short-lived git ref corresponding to most recent fetch)
_run_git_command(["git", "reset", "--hard", "FETCH_HEAD"]) _run_git_command(["git", "reset", "--hard", "FETCH_HEAD"], str(repo_dir))
if (repo_dir / "esphome" / "components").is_dir(): if (repo_dir / "esphome" / "components").is_dir():
components_dir = repo_dir / "esphome" / "components" components_dir = repo_dir / "esphome" / "components"