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

This aligns the behavior with the opam loader

Related to T3358
This commit is contained in:
Antoine R. Dumont (@ardumont) 2021-07-20 16:46:10 +02:00
parent 6c12350863
commit f00d41d0cd
No known key found for this signature in database
GPG key ID: 52E2E9840D10C3B8

View file

@ -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,