Merge branch 'master' into beta

Author: Naatan

internal/runners/update/lock.go

@@ -1,7 +1,6 @@
 package update
 
 import (
-	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/output"
@@ -46,9 +45,14 @@ func (l *Lock) Run(params *LockParams) error {
 	}
 	channel := fetchChannel(defaultChannel, prefer)
 
-	_, info, err := fetchUpdater(constants.Version, channel)
-	if err != nil {
-		return errs.Wrap(err, "fetchUpdater failed")
+	var version string
+	if l.project.IsLocked() && channel == l.project.Branch() {
+		version = l.project.Version()
+	}
+
+	_, info, err := fetchUpdater(version, channel)
+	if err != nil || info == nil {
+		return errs.Wrap(err, "fetchUpdater failed, info: %v", info)
 	}
 
 	err = projectfile.AddLockInfo(l.project.Source().Path(), channel, info.Version)

internal/runners/update/update.go

@@ -48,6 +48,11 @@ func (u *Update) Run(params *Params) error {
 		return errs.Wrap(err, "fetchUpdater failed")
 	}
 
+	if info == nil {
+		u.out.Print(locale.Tl("update_uptodate", "You are already using the latest State Tool version available."))
+		return nil
+	}
+
 	if err = up.Run(u.out, false); err != nil {
 		if os.IsPermission(errs.InnerError(err)) {
 			return locale.WrapError(err, "err_update_failed_due_to_permissions", "Update failed due to permission error.  You may have to re-run the command as a privileged user.")