From 4e2d42e3972b31ab8bc59a05f21f8064c6f9c4db Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Mon, 13 Apr 2020 18:49:05 +0200 Subject: [PATCH] Drop downloadOnly bool from installer.Install --- pkg/installer/installer.go | 2 +- pkg/installer/installer_test.go | 10 +++++----- pkg/installer/interface.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/installer/installer.go b/pkg/installer/installer.go index b8dc0e4f..cd414426 100644 --- a/pkg/installer/installer.go +++ b/pkg/installer/installer.go @@ -153,7 +153,7 @@ func (l *LuetInstaller) swap(syncedRepos Repositories, toRemove pkg.Packages, to return l.install(syncedRepos, toInstall, s) } -func (l *LuetInstaller) Install(cp pkg.Packages, s *System, downloadOnly bool) error { +func (l *LuetInstaller) Install(cp pkg.Packages, s *System) error { syncedRepos, err := l.SyncRepositories(true) if err != nil { return err diff --git a/pkg/installer/installer_test.go b/pkg/installer/installer_test.go index a75eddbf..522f55cb 100644 --- a/pkg/installer/installer_test.go +++ b/pkg/installer/installer_test.go @@ -115,7 +115,7 @@ urls: Expect(repo.GetType()).To(Equal("disk")) systemDB := pkg.NewInMemoryDatabase(false) system := &System{Database: systemDB, Target: fakeroot} - err = inst.Install([]pkg.Package{&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"}}, system, false) + err = inst.Install([]pkg.Package{&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"}}, system) Expect(err).ToNot(HaveOccurred()) Expect(helpers.Exists(filepath.Join(fakeroot, "test5"))).To(BeTrue()) @@ -234,7 +234,7 @@ urls: Expect(repo.GetType()).To(Equal("disk")) systemDB := pkg.NewInMemoryDatabase(false) system := &System{Database: systemDB, Target: fakeroot} - err = inst.Install([]pkg.Package{&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"}}, system, false) + err = inst.Install([]pkg.Package{&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"}}, system) Expect(err).ToNot(HaveOccurred()) Expect(helpers.Exists(filepath.Join(fakeroot, "test5"))).To(BeTrue()) @@ -354,7 +354,7 @@ urls: systemDB := pkg.NewBoltDatabase(filepath.Join(bolt, "db.db")) system := &System{Database: systemDB, Target: fakeroot} - err = inst.Install([]pkg.Package{&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"}}, system, false) + err = inst.Install([]pkg.Package{&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"}}, system) Expect(err).ToNot(HaveOccurred()) Expect(helpers.Exists(filepath.Join(fakeroot, "test5"))).To(BeTrue()) @@ -464,7 +464,7 @@ urls: systemDB := pkg.NewBoltDatabase(filepath.Join(bolt, "db.db")) system := &System{Database: systemDB, Target: fakeroot} - err = inst.Install([]pkg.Package{&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"}}, system, false) + err = inst.Install([]pkg.Package{&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"}}, system) Expect(err).ToNot(HaveOccurred()) Expect(helpers.Exists(filepath.Join(fakeroot, "test5"))).To(BeTrue()) @@ -581,7 +581,7 @@ urls: systemDB := pkg.NewBoltDatabase(filepath.Join(bolt, "db.db")) system := &System{Database: systemDB, Target: fakeroot} - err = inst.Install([]pkg.Package{&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"}}, system, false) + err = inst.Install([]pkg.Package{&pkg.DefaultPackage{Name: "b", Category: "test", Version: "1.0"}}, system) Expect(err).ToNot(HaveOccurred()) Expect(helpers.Exists(filepath.Join(fakeroot, "test5"))).To(BeTrue()) diff --git a/pkg/installer/interface.go b/pkg/installer/interface.go index 64a64aa5..390dfbfc 100644 --- a/pkg/installer/interface.go +++ b/pkg/installer/interface.go @@ -23,7 +23,7 @@ import ( ) type Installer interface { - Install(pkg.Packages, *System, bool) error + Install(pkg.Packages, *System) error Uninstall(pkg.Package, *System) error Upgrade(s *System) error Repositories([]Repository)