New upstream version 1.5.0+ds1

console/progress.go

@@ -69,7 +69,7 @@ func (p *Progress) Flush() {
 }
 
 // InitBar starts progressbar for count bytes or count items
-func (p *Progress) InitBar(count int64, isBytes bool) {
+func (p *Progress) InitBar(count int64, isBytes bool, barType aptly.BarType) {
 	if p.bar != nil {
 		panic("bar already initialized")
 	}

console/terminal.go

@@ -3,10 +3,10 @@ package console
 import (
 	"syscall"
 
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 )
 
 // RunningOnTerminal checks whether stdout is terminal
 func RunningOnTerminal() bool {
-	return terminal.IsTerminal(syscall.Stdout)
+	return term.IsTerminal(syscall.Stdout)
 }