relikd/brew.py
1
0
Fork 0
Code Pull Requests Releases Activity

fix: proper primary detection

Browse Source
This commit is contained in:
relikd
2025-09-03 15:00:54 +02:00
parent 92ddff7f61
commit be90fd6c39
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
brew.py
View File

@@ -1735,6 +1735,7 @@ class InstallQueue:
def __init__(self, *, dryRun: bool, force: bool) -> None: def __init__(self, *, dryRun: bool, force: bool) -> None:
self.dryRun = dryRun self.dryRun = dryRun
self.force = force self.force = force
self._primary = set() # type: set[str] # pkg
self._missingDigest = [] # type: list[str] # pkg self._missingDigest = [] # type: list[str] # pkg
self.downloadQueue = [] # type: list[InstallQueue.Item] self.downloadQueue = [] # type: list[InstallQueue.Item]
self.installQueue = [] # type: list[str] # tar file path self.installQueue = [] # type: list[str] # tar file path
@@ -1745,6 +1746,7 @@ class InstallQueue:
if os.path.isfile(pkgOrFile) and pkgOrFile.endswith('.tar.gz'): if os.path.isfile(pkgOrFile) and pkgOrFile.endswith('.tar.gz'):
Log.info('==> Install from tar file ...') Log.info('==> Install from tar file ...')
self.installQueue.append(pkgOrFile) self.installQueue.append(pkgOrFile)
self._primary.add(pkgOrFile)
elif '/' in pkgOrFile: elif '/' in pkgOrFile:
Log.error('package may not contain path-separator') Log.error('package may not contain path-separator')
elif recursive: elif recursive:
@@ -1754,9 +1756,11 @@ class InstallQueue:
Log.info('==> Ignoring dependencies ...') Log.info('==> Ignoring dependencies ...')
bundle = Brew.info(pkgOrFile) bundle = Brew.info(pkgOrFile)
self.add(pkgOrFile, bundle.version, bundle.digest) self.add(pkgOrFile, bundle.version, bundle.digest)
self._primary.add(pkgOrFile)
def addRecursive(self, pkg: str) -> None: def addRecursive(self, pkg: str) -> None:
''' Recursive online search for dependencies ''' ''' Recursive online search for dependencies '''
self._primary.add(pkg)
queue = [pkg] queue = [pkg]
done = set(self._missingDigest).union( done = set(self._missingDigest).union(
x.package for x in self.downloadQueue) x.package for x in self.downloadQueue)
@@ -1824,12 +1828,12 @@ class InstallQueue:
linkDeps = Config.INSTALL.LINK_BIN_DEPS if linkExe is None else linkExe linkDeps = Config.INSTALL.LINK_BIN_DEPS if linkExe is None else linkExe
# reverse to install main package last (allow re-install until success) # reverse to install main package last (allow re-install until success)
for i, tar in enumerate(reversed(self.installQueue), 1): for tar in reversed(self.installQueue):
bundle = TarPackage(tar).extract(dryRun=self.dryRun) bundle = TarPackage(tar).extract(dryRun=self.dryRun)
if not bundle: if not bundle:
continue # install error continue # install error
isPrimary = i == total isPrimary = bundle.package in self._primary or tar in self._primary
linkBin = linkPrim if isPrimary else linkDeps linkBin = linkPrim if isPrimary else linkDeps
if self.dryRun: if self.dryRun: