Skip to content
Snippets Groups Projects
Verified Commit f00d41d0 authored by Antoine R. Dumont's avatar Antoine R. Dumont
Browse files

opam: Directly use the --root flag instead of using an env variable

This aligns the behavior with the opam loader

Related to T3358
parent 6c123508
No related branches found
No related tags found
No related merge requests found
......@@ -51,9 +51,19 @@ class OpamLister(StatelessLister[PageType]):
scheduler=scheduler, credentials=credentials, url=url, instance=instance,
)
self.env = os.environ.copy()
self.env["OPAMROOT"] = tempfile.mkdtemp(prefix="swh_opam_lister")
self.opamroot = tempfile.mkdtemp(prefix="swh_opam_lister")
call(
["opam", "init", "--reinit", "--bare", "--no-setup", instance, url],
[
"opam",
"init",
"--reinit",
"--bare",
"--no-setup",
"--root",
self.opamroot,
instance,
url,
],
env=self.env,
)
......@@ -66,6 +76,8 @@ class OpamLister(StatelessLister[PageType]):
"--no-switch",
"--repos",
self.instance,
"--root",
self.opamroot,
"--normalise",
"--short",
],
......@@ -87,7 +99,7 @@ class OpamLister(StatelessLister[PageType]):
url=url,
last_update=None,
extra_loader_arguments={
"opam_root": self.env["OPAMROOT"],
"opam_root": self.opamroot,
"opam_instance": self.instance,
"opam_url": self.url,
"opam_package": page,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment