ref: if not bundle continue
This commit is contained in:
48
brew.py
48
brew.py
@@ -1769,36 +1769,38 @@ class InstallQueue:
|
|||||||
# 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 i, tar in enumerate(reversed(self.installQueue), 1):
|
||||||
bundle = TarPackage(tar).extract(dryRun=self.dryRun)
|
bundle = TarPackage(tar).extract(dryRun=self.dryRun)
|
||||||
if bundle:
|
if not bundle:
|
||||||
isPrimary = i == total
|
continue # install error
|
||||||
linkBin = linkPrim if isPrimary else linkDeps
|
|
||||||
|
|
||||||
if self.dryRun:
|
isPrimary = i == total
|
||||||
if not linkBin:
|
linkBin = linkPrim if isPrimary else linkDeps
|
||||||
Log.info('will NOT link binaries')
|
|
||||||
continue
|
|
||||||
|
|
||||||
# post-install stuff
|
if self.dryRun:
|
||||||
pkg = LocalPackage(bundle.package)
|
if not linkBin:
|
||||||
if not isUpgrade:
|
Log.info('will NOT link binaries')
|
||||||
pkg.setPrimary(isPrimary)
|
continue
|
||||||
|
|
||||||
vpkg = pkg.version(bundle.version)
|
# post-install stuff
|
||||||
vpkg.setDigest(File.sha256(tar))
|
pkg = LocalPackage(bundle.package)
|
||||||
vpkg.fix() # relink dylibs
|
if not isUpgrade:
|
||||||
|
pkg.setPrimary(isPrimary)
|
||||||
|
|
||||||
self.finished.append((pkg.name, vpkg.version))
|
vpkg = pkg.version(bundle.version)
|
||||||
|
vpkg.setDigest(File.sha256(tar))
|
||||||
|
vpkg.fix() # relink dylibs
|
||||||
|
|
||||||
if skipLink or isUpgrade:
|
self.finished.append((pkg.name, vpkg.version))
|
||||||
continue
|
|
||||||
|
|
||||||
if vpkg.isKegOnly:
|
if skipLink or isUpgrade:
|
||||||
Log.warn('keg-only, must link manually ({}, {})'.format(
|
continue
|
||||||
pkg.name, vpkg.version), summary=True)
|
|
||||||
continue
|
|
||||||
|
|
||||||
pkg.unlink()
|
if vpkg.isKegOnly:
|
||||||
vpkg.link(linkBin=linkBin)
|
Log.warn('keg-only, must link manually ({}, {})'.format(
|
||||||
|
pkg.name, vpkg.version), summary=True)
|
||||||
|
continue
|
||||||
|
|
||||||
|
pkg.unlink()
|
||||||
|
vpkg.link(linkBin=linkBin)
|
||||||
|
|
||||||
Log.endCounter()
|
Log.endCounter()
|
||||||
Log.dumpErrorSummary()
|
Log.dumpErrorSummary()
|
||||||
|
|||||||
Reference in New Issue
Block a user