generator: don't specify company for emeritus_leads

If we end up specifying the company for emeritus leads, we could end
up stale information. Moreover, we don't gain any specific value
from company info of emeritus leads.

1 files changed, 7 insertions, 3 deletions

diff --git a/generator/app.go b/generator/app.go
index a5f05b1f..5171df2f 100644
--- a/generator/app.go
+++ b/generator/app.go
@@ -68,7 +68,7 @@ func (x FoldedString) MarshalYAML() (interface{}, error) {
 type Person struct {
 	GitHub  string
 	Name    string
-	Company string
+	Company string `yaml:"company,omitempty"`
 }
 
 // Meeting represents a regular meeting for a group.
@@ -233,12 +233,16 @@ func (c *Context) Validate() []error {
 			for prefix, persons := range group.Leadership.PrefixToPersonMap() {
 				for _, person := range persons {
 					if val, ok := people[person.GitHub]; ok {
-						if val.Name != person.Name || val.Company != person.Company {
+						if val.Name != person.Name || (prefix != "emeritus_lead" && val.Company != person.Company) {
 							errors = append(errors, fmt.Errorf("%s: %ss: expected person: %v, got: %v", group.Dir, prefix, val, person))
 						}
-					} else {
+					} else if prefix != "emeritus_lead" {
 						people[person.GitHub] = person
 					}
+
+					if prefix == "emeritus_lead" && person.Company != "" {
+						errors = append(errors, fmt.Errorf("%s: emeritus leads should not have company specified; company specified for: %s", group.Dir, person.Name))
+					}
 				}
 			}
 			if len(group.StakeholderSIGs) != 0 {