Merge "jiri-v23-profiles: Use relative paths everywhere in profile manifests."
diff --git a/profiles/util.go b/profiles/util.go
index 92b7e26..dd32234 100644
--- a/profiles/util.go
+++ b/profiles/util.go
@@ -189,11 +189,11 @@
}
return nil
}
- return jirix.NewSeq().Call(installDepsFn, "Install dependencies").Done()
+ return jirix.NewSeq().Call(installDepsFn, "Install dependencies: "+strings.Join(pkgs, ",")).Done()
}
// ensureAction ensures that the requested profile and target
-// is installed/uninstalled, installing/uninstalling it if only if necessary.
+// is installed/uninstalled, installing/uninstalling it if and only if necessary.
func ensureAction(jirix *jiri.X, action Action, profile string, root RelativePath, target Target) error {
verb := ""
switch action {
@@ -204,6 +204,9 @@
default:
return fmt.Errorf("unrecognised action %v", action)
}
+ if jirix.Verbose() || jirix.DryRun() {
+ fmt.Fprintf(jirix.Stdout(), "%s %v %s\n", verb, action, target)
+ }
if t := LookupProfileTarget(profile, target); t != nil {
if jirix.Verbose() {
fmt.Fprintf(jirix.Stdout(), "%v %v is already %sed as %v\n", profile, target, verb, t)
