Catchup to vsolver; fix compile errs

Author: sdboyer

action/install.go

@@ -1,7 +1,7 @@
 package action
 
 import (
-	"encoding/hex"
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -31,7 +31,7 @@ func Install(installer *repo.Installer, strip, stripVendor bool) {
 	}
 
 	opts := vsolver.SolveOpts{
-		Name: vsolver.ProjectName(filepath.Dir(installer.Vendor)),
+		N:    vsolver.ProjectName(filepath.Dir(installer.Vendor)),
 		Root: filepath.Dir(installer.Vendor),
 		M:    conf,
 	}
@@ -42,25 +42,25 @@ func Install(installer *repo.Installer, strip, stripVendor bool) {
 			msg.Die("Could not load lockfile.")
 		}
 		// Check if digests match, and warn if they don't
-		if opts.L.InputHash() != hex.EncodeToString(opts.HashInputs()) {
+		if bytes.Equal(opts.L.InputHash(), opts.HashInputs()) {
 			msg.Warn("glide.yaml is out of sync with glide.lock!")
 		}
-		err = writeVendor(installer.Vendor, l, sm)
+		err = writeVendor(installer.Vendor, opts.L, sm)
 		if err != nil {
-			msg.Die(err)
+			msg.Die(err.Error())
 		}
 	} else {
 		// There is no lock, so we solve first
 		s := vsolver.NewSolver(sm, logrus.New())
 		r, err := s.Solve(opts)
 		if err != nil {
 			// TODO better error handling
-			msg.Die(err)
+			msg.Die(err.Error())
 		}
 
 		err = writeVendor(installer.Vendor, r, sm)
 		if err != nil {
-			msg.Die(err)
+			msg.Die(err.Error())
 		}
 	}
 }
@@ -78,7 +78,7 @@ func writeVendor(vendor string, l vsolver.Lock, sm vsolver.SourceManager) error
 		return fmt.Errorf("Error while generating vendor tree: %s", err)
 	}
 
-	err = os.Rename(td, installer.Vendor)
+	err = os.Rename(td, vendor)
 	if err != nil {
 		return fmt.Errorf("Error while moving generated vendor directory into place: %s", err)
 	}

action/update.go

@@ -32,7 +32,7 @@ func Update(installer *repo.Installer, skipRecursive, strip, stripVendor bool) {
 	}
 
 	opts := vsolver.SolveOpts{
-		Name: vsolver.ProjectName(filepath.Dir(installer.Vendor)),
+		N:    vsolver.ProjectName(filepath.Dir(installer.Vendor)),
 		Root: filepath.Dir(installer.Vendor),
 		M:    conf,
 	}
@@ -48,12 +48,12 @@ func Update(installer *repo.Installer, skipRecursive, strip, stripVendor bool) {
 	r, err := s.Solve(opts)
 	if err != nil {
 		// TODO better error handling
-		msg.Die(err)
+		msg.Die(err.Error())
 	}
 
 	err = writeVendor(installer.Vendor, r, sm)
 	if err != nil {
-		msg.Die(err)
+		msg.Die(err.Error())
 	}
 
 	// TODO compare old and new lock, and only change if contents differ
@@ -65,7 +65,7 @@ func Update(installer *repo.Installer, skipRecursive, strip, stripVendor bool) {
 	}
 
 	for _, p := range r.Projects() {
-		l := &Lock{
+		l := &cfg.Lock{
 			Name:       string(p.Name()),
 			Repository: p.URI(), // TODO this is wrong
 			VcsType:    "",      // TODO allow this to be extracted from sm
@@ -79,13 +79,13 @@ func Update(installer *repo.Installer, skipRecursive, strip, stripVendor bool) {
 		}
 	}
 
-	err = l.WriteFile(filepath.Join(base, gpath.LockFile))
+	err = lf.WriteFile(filepath.Join(base, gpath.LockFile))
 	if err != nil {
 		msg.Die("Error on writing new lock file: %s", err)
 	}
 
 	err = writeVendor(installer.Vendor, r, sm)
 	if err != nil {
-		msg.Die(err)
+		msg.Die(err.Error())
 	}
 }

cfg/lock.go

@@ -1,6 +1,7 @@
 package cfg
 
 import (
+	"encoding/hex"
 	"io/ioutil"
 	"sort"
 	"strings"
@@ -50,8 +51,12 @@ func (lf *Lockfile) WriteFile(lockpath string) error {
 
 // InputHash returns the hash of the input arguments that resulted in this lock
 // file.
-func (lf *Lockfile) InputHash() string {
-	return lf.Hash
+func (lf *Lockfile) InputHash() []byte {
+	b, err := hex.DecodeString(lf.Hash)
+	if err != nil {
+		return nil
+	}
+	return b
 }
 
 // Projects returns the list of projects enumerated in the lock file.