[vpython] Verify environment, named installs.

vpython/application/subcommand_verify.go

 // Copyright 2017 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package application
 
 import (
         "strings"
 
         "github.com/maruel/subcommands"
@@ skipping 24 matching lines @@
 
 func (cr *verifyCommandRun) Run(app subcommands.Application, args []string, env subcommands.Env) int {
         c := cli.GetContext(app, cr, env)
         a := getApplication(c, args)
 
         return run(c, func(c context.Context) error {
                 // Make sure that we can resolve the referenced specifiction.
                 if err := a.opts.ResolveSpec(c); err != nil {
                         return errors.Annotate(err).Reason("failed to resolve specification").Err()
                 }
-                if err := spec.Normalize(a.opts.EnvConfig.Spec, &a.opts.EnvConfig.Package); err != nil {
+                if a.opts.EnvConfig.Spec.Virtualenv == nil {
+                        a.opts.EnvConfig.Spec.Virtualenv = &a.opts.EnvConfig.Package
+                }
+                if err := spec.NormalizeSpec(a.opts.EnvConfig.Spec); err != nil {
                         return errors.Annotate(err).Reason("failed to normalize specification").Err()
                 }
                 s := a.opts.EnvConfig.Spec
                 renderedSpec := spec.Render(s)
                 logging.Infof(c, "Successfully verified specification:\n%s", renderedSpec)
 
                 // Run our Verification generator and verify each generated environment.
                 if a.WithVerificationConfig != nil {
                         err := a.WithVerificationConfig(c, func(cfg Config, verificationScenarios []*vpython.Pep425Tag) error {
                                 if len(s.VerifyPep425Tag) > 0 {
@@ skipping 27 matching lines @@
                                 return nil
                         })
                         if err != nil {
                                 return err
                         }
                 }
 
                 return nil
         })
 }