cmd/snap,client,daemon: show ignore-validation in notes #4112

Closed
wants to merge 1 commit into
from
Jump to file or symbol
Failed to load files and symbols.
+21 −2
Split
View
@@ -46,6 +46,7 @@ type Snap struct {
Version string `json:"version"`
Channel string `json:"channel"`
TrackingChannel string `json:"tracking-channel"`
+ IgnoreValidation bool `json:"ignore-validation"`
Revision snap.Revision `json:"revision"`
Confinement string `json:"confinement"`
Private bool `json:"private"`
View
@@ -346,6 +346,9 @@ func (x *infoCmd) Execute([]string) error {
}
fmt.Fprintf(w, "tracking:\t%s\n", local.TrackingChannel)
+ if local.IgnoreValidation {
+ fmt.Fprintf(w, "ignore-validation:\t%t\n", true)
+ }
fmt.Fprintf(w, "installed:\t%s\t(%s)\t%s\t%s\n", local.Version, local.Revision, strutil.SizeToStr(local.InstalledSize), notes)
fmt.Fprintf(w, "refreshed:\t%s\n", local.InstallDate)
}
View
@@ -455,7 +455,7 @@ version: %s
snapst.Active = active
snapst.Sequence = append(snapst.Sequence, &snapInfo.SideInfo)
snapst.Current = snapInfo.SideInfo.Revision
- snapst.Channel = "beta"
+ snapst.Channel = "stable"
snapstate.Set(st, name, &snapst)
}
@@ -533,6 +533,20 @@ UnitFileState=potatoes
`),
}
+ var snapst snapstate.SnapState
+ st := s.d.overlord.State()
+ st.Lock()
+ err := snapstate.Get(st, "foo", &snapst)
+ st.Unlock()
+ c.Assert(err, check.IsNil)
+
+ // modify state
+ snapst.Channel = "beta"
+ snapst.IgnoreValidation = true
+ st.Lock()
+ snapstate.Set(st, "foo", &snapst)
+ st.Unlock()
+
req, err := http.NewRequest("GET", "/v2/snaps/foo", nil)
c.Assert(err, check.IsNil)
rsp, ok := getSnapInfo(snapCmd, req, nil).(*resp)
@@ -560,6 +574,7 @@ UnitFileState=potatoes
Version: "v1",
Channel: "stable",
TrackingChannel: "beta",
+ IgnoreValidation: true,
Title: "title",
Summary: "summary",
Description: "description",
View
@@ -339,7 +339,7 @@ func mapLocal(about aboutSnap) *client.Snap {
Version: localSnap.Version,
Channel: localSnap.Channel,
TrackingChannel: snapst.Channel,
- // TODO: send ignore-validation
+ IgnoreValidation: snapst.IgnoreValidation,
Confinement: string(localSnap.Confinement),
DevMode: snapst.DevMode,
TryMode: snapst.TryMode,