Skip to content

Commit

Permalink
fix: feedback from PR
Browse files Browse the repository at this point in the history
Signed-off-by: Callahan Kovacs <[email protected]>
  • Loading branch information
mr-cal committed Oct 6, 2023
1 parent 234aac8 commit e9a407e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions snapcraft/commands/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def _get_effective_base(self) -> str:

return base

def _get_project_architectures(self) -> List[str]:
def _get_project_build_on_architectures(self) -> List[str]:
"""Get a list of build-on architectures from the project's snapcraft.yaml.
:returns: A list of architectures.
Expand Down Expand Up @@ -347,11 +347,11 @@ def _determine_architectures(self) -> List[str]:
:raises SnapcraftError: If `--build-on` was provided and architectures are
defined in the project's snapcraft.yaml.
"""
project_architectures = self._get_project_architectures()
project_architectures = self._get_project_build_on_architectures()
if project_architectures and self._parsed_args.build_for:
raise SnapcraftError(
"Cannot use `--build-on` because architectures are already defined in "
"the snapcraft.yaml."
"snapcraft.yaml."
)

if project_architectures:
Expand Down
2 changes: 1 addition & 1 deletion snapcraft/remote/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def validate_architectures(architectures: List[str]) -> None:
def get_build_id(app_name: str, project_name: str, project_path: Path) -> str:
"""Get the build id for a project.
The build id is formatted as `snapcraft-<project-name>-<hash>`.
The build id is formatted as `<app_name>-<project-name>-<hash>`.
The hash is a hash of all files in the project directory.
:param app_name: Name of the application.
Expand Down
4 changes: 2 additions & 2 deletions snapcraft/remote/worktree.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

from xdg import BaseDirectory

from snapcraft.remote import GitRepo
from snapcraft.remote.utils import rmtree
from .git import GitRepo
from .utils import rmtree


class WorkTree:
Expand Down

0 comments on commit e9a407e

Please sign in to comment.