Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION := 1.8.0
VERSION := 1.8.1
BINNAME := solbuild

.PHONY: build
Expand Down
15 changes: 7 additions & 8 deletions builder/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,15 +405,10 @@ func (m *Manager) Chroot() error {
return ErrInterrupted
}

m.lock.Lock()

if m.pkg == nil {
m.lock.Unlock()
return ErrNoPackage
if err := m.checkPackage(); err != nil {
return err
}

m.lock.Unlock()

// Now get on with the real work!
defer m.Cleanup()

Expand Down Expand Up @@ -512,5 +507,9 @@ func (m *Manager) checkPackage() error {
m.lock.Lock()
defer m.lock.Unlock()

return ErrNoPackage
if m.pkg == nil {
return ErrNoPackage
}

return nil
}