Skip to content
This repository has been archived by the owner on Oct 17, 2022. It is now read-only.

Commit

Permalink
Move osprepare from ciao
Browse files Browse the repository at this point in the history
Fixes: #110

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
  • Loading branch information
Ganesh Maharaj Mahalingam committed Apr 23, 2019
1 parent 4004e35 commit 5a16cad
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go:
- tip

env:
- GOLANGCILINT=$(curl -fsSLI -o /dev/null -w %{url_effective} https://github.com/golangci/golangci-lint/releases/latest | awk -F '/' '{print $8}')
- GOLANGCILINT="v1.16.0"

go_import_path: github.com/intel/ccloudvm

Expand Down
42 changes: 37 additions & 5 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"text/tabwriter"
"time"

"github.com/ciao-project/ciao/osprepare"
"github.com/intel/ccloudvm/osprepare"
"github.com/intel/ccloudvm/types"
"github.com/pkg/errors"
)
Expand All @@ -55,11 +55,11 @@ func (l logger) Infof(s string, args ...interface{}) {
}

func (l logger) Warningf(s string, args ...interface{}) {
l.Infof(s, args)
l.Infof(s, args...)
}

func (l logger) Errorf(s string, args ...interface{}) {
l.Infof(s, args)
l.Infof(s, args...)
}

const systemdService = `
Expand Down
2 changes: 1 addition & 1 deletion client/deps.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package client

import "github.com/ciao-project/ciao/osprepare"
import "github.com/intel/ccloudvm/osprepare"

var ccloudvmClearDeps = []osprepare.PackageRequirement{
{BinaryName: "/usr/bin/unxz", PackageName: "os-core-update"},
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func InstallDeps(ctx context.Context, reqs PackageRequirements, logger clogger.C
}
if reqPkgs := collectPackages(distro, reqs); reqPkgs != nil {
logger.Infof("Missing packages detected: %v", reqPkgs)
if distro.InstallPackages(ctx, reqPkgs, logger) == false {
if !distro.InstallPackages(ctx, reqPkgs, logger) {
logger.Errorf("Failed to install: %s", strings.Join(reqPkgs, ", "))
return
}
Expand Down

0 comments on commit 5a16cad

Please sign in to comment.