Skip to content

Commit 31731cc

Browse files
author
Chris Patterson
authored
plugins v2: use repo.Repo not repo.Ubuntu in colcon (#3257)
References to repo.Ubuntu break on non-Ubuntu systems on import. Signed-off-by: Chris Patterson <chris.patterson@canonical.com>
1 parent fbd93aa commit 31731cc

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

snapcraft/plugins/v2/colcon.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
import click
6464
from catkin_pkg import packages as catkin_packages
6565

66-
from snapcraft.internal.repo import Ubuntu
66+
from snapcraft.internal.repo import Repo
6767
from snapcraft.plugins.v1._ros.rosdep import _parse_rosdep_resolve_dependencies
6868
from snapcraft.plugins.v2 import PluginV2
6969

@@ -231,14 +231,14 @@ def stage_runtime_dependencies(part_install: str, ros_distro: str):
231231
stage_packages_path = install_path.parent / "stage_packages"
232232

233233
click.echo(f"Fetching stage packages: {package_names!r}")
234-
Ubuntu.fetch_stage_packages(
234+
Repo.fetch_stage_packages(
235235
package_names=package_names,
236236
base="core20",
237237
stage_packages_path=stage_packages_path,
238238
)
239239

240240
click.echo(f"Unpacking stage packages: {package_names!r}")
241-
Ubuntu.unpack_stage_packages(
241+
Repo.unpack_stage_packages(
242242
stage_packages_path=stage_packages_path, install_path=install_path
243243
)
244244

0 commit comments

Comments
 (0)