Modify cabbie to explicitly not search for hidden updates during defa…

…ult and aukera update timers. PiperOrigin-RevId: 599245036
google · Jan 19, 2024 · fd1e703 · fd1e703
1 parent 23fc46e
commit fd1e703
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/cabbie.go b/cabbie.go
@@ -362,7 +362,7 @@ func runMainLoop() error {
 	for {
 		select {
 		case <-t.Default.C:
-			i := installCmd{Interactive: false}
+			i := installCmd{Interactive: false, visibleUpdates: true}
 			err := i.installUpdates()
 			if e := updateInstallSuccess.Set(err == nil); e != nil {
 				deck.ErrorfA("Error posting metric:\n%v", e).With(eventID(cablib.EvtErrMetricReport)).Go()
@@ -385,7 +385,7 @@ func runMainLoop() error {
 				break
 			}
 			if s[0].State == "open" {
-				i := installCmd{Interactive: false}
+				i := installCmd{Interactive: false, visibleUpdates: true}
 				err := i.installUpdates()
 				if e := updateInstallSuccess.Set(err == nil); e != nil {
 					deck.ErrorfA("Error posting updateInstallSuccess metric:\n%v", e).With(eventID(cablib.EvtErrMetricReport)).Go()
@@ -427,7 +427,7 @@ func runMainLoop() error {
 			}
 
 			if config.Deadline != 0 {
-				i := installCmd{Interactive: false, deadlineOnly: true}
+				i := installCmd{Interactive: false, deadlineOnly: true, visibleUpdates: true}
 				if err := i.installUpdates(); err != nil {
 					deck.ErrorfA("Error installing system updates:\n%v", err).With(eventID(cablib.EvtErrInstallFailure)).Go()
 				}

diff --git a/install.go b/install.go
@@ -37,8 +37,8 @@ import (
 
 // Available flags
 type installCmd struct {
-	all, drivers, deadlineOnly, Interactive, virusDef bool
-	kbs                                               string
+	all, drivers, deadlineOnly, Interactive, virusDef, visibleUpdates bool
+	kbs                                                               string
 }
 
 type installRsp struct {
@@ -122,10 +122,13 @@ func (i *installCmd) criteria() (string, []string) {
 	case i.kbs != "":
 		c = search.BasicSearch
 		deck.InfofA("Starting search for KB's %q:\n%s", i.kbs, c).With(eventID(cablib.EvtSearch)).Go()
+	case i.visibleUpdates:
+		c = search.BasicSearch + " and IsHidden=0"
+		deck.InfofA("Starting search for updates which aren't hidden: %s", c).With(eventID(cablib.EvtSearch)).Go()
 	default:
 		c = search.BasicSearch
 		rc = config.RequiredCategories
-		deck.InfofA("Starting search for general updates: %s", c).With(eventID(cablib.EvtSearch)).Go()
+		deck.InfofA("Starting search for all general updates: %s", c).With(eventID(cablib.EvtSearch)).Go()
 	}
 	return c, rc
 }