billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run sudo.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-16 17:09:23 +00:00
parent 6aaa2df421
commit 79de95e787
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
5 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ognibuild/debian/apt.py
View file

@ -26,13 +26,15 @@ from buildlog_consultant.apt import (
)
from .. import DetailedFailure, UnidentifiedError
from ..session import Session, run_with_tee
from ..session import Session, run_with_tee, get_user
from .file_search import FileSearcher, AptCachedContentsFileSearcher, GENERATED_FILE_SEARCHER, get_package_for_paths
def run_apt(session: Session, args: List[str]) -> None:
def run_apt(session: Session, args: List[str], prefix: Optional[List[str]] = None) -> None:
"""Run apt."""
args = ["apt", "-y"] + args
if prefix is None:
prefix = []
args = prefix = ["apt", "-y"] + args
retcode, lines = run_with_tee(session, args, cwd="/", user="root")
if retcode == 0:
return
@ -49,10 +51,21 @@ class AptManager(object):
session: Session
_searchers: Optional[List[FileSearcher]]
def __init__(self, session):
def __init__(self, session, prefix=None):
self.session = session
self._apt_cache = None
self._searchers = None
if prefix is None:
prefix = []
self.prefix = prefix
@classmethod
def from_session(cls, session):
if get_user(session) != "root":
prefix = ["sudo"]
else:
prefix = []
return cls(session, prefix=prefix)
def searchers(self):
if self._searchers is None:
@ -94,10 +107,10 @@ class AptManager(object):
logging.info("Installing using apt: %r", packages)
packages = self.missing(packages)
if packages:
run_apt(self.session, ["install"] + packages)
run_apt(self.session, ["install"] + packages, prefix=self.prefix)
def satisfy(self, deps: List[str]) -> None:
run_apt(self.session, ["satisfy"] + deps)
run_apt(self.session, ["satisfy"] + deps, prefix=self.prefix)
def satisfy_command(self, deps: List[str]) -> List[str]:
return ["apt", "satisfy"] + deps
return self.prefix + ["apt", "satisfy"] + deps