Skip to content

Commit

Permalink
Merge pull request #47 from vinyl-linux/installation_regressions
Browse files Browse the repository at this point in the history
Installation regressions
  • Loading branch information
jspc authored Feb 23, 2023
2 parents 975a1b5 + b0ef3dc commit 31e1726
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions os.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,13 @@ func installServiceDir(src string) (err error) {
return os.Symlink(l, dst)
}

source, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, info.Mode())
source, err := os.Open(path)
if err != nil {
return err
}
defer source.Close()

destination, err := os.Create(dst)
destination, err := os.OpenFile(dst, os.O_RDWR|os.O_CREATE, info.Mode())
if err != nil {
return err
}
Expand Down
9 changes: 8 additions & 1 deletion server.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,21 @@ func (s Server) Version(ctx context.Context, _ *emptypb.Empty) (v *server.Versio
}

func (s Server) createMetaPackage(packages []string) (err error) {
var pm *Manifest

// create a new 'meta package'
deps := make([]Dep, len(packages))
for i, p := range packages {
if p == "" {
return errEmptyPackage
}

deps[i] = [2]string{p, ">=0"}
pm, err = s.mdb.Latest(p, latest)
if err != nil {
return
}

deps[i] = [2]string{pm.Provides, pm.Version.String()}
}

metaManifest := &Manifest{
Expand Down
5 changes: 4 additions & 1 deletion server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"context"
"os"
"path/filepath"
"testing"

Expand Down Expand Up @@ -93,7 +94,9 @@ func TestServer_Install_WithService(t *testing.T) {
configFile = "testdata/test-config.toml"
cacheDir = "/tmp"
sockAddr = "/tmp/vin-test.sock"
svcDir = "testdata/manifests-with-services/svcDir"

svcDir, _ = os.MkdirTemp("", "")
t.Logf(svcDir)

err := loadConfig()
if err != nil {
Expand Down

This file was deleted.

Empty file.

0 comments on commit 31e1726

Please sign in to comment.