Merge pull request #5743 from mvo5/dont-panic-in-image

image: handle errors when downloadedSnapsInfoForBootConfig has no data
snapcore · Aug 31, 2018 · a2629ed · a2629ed
2 parents cb747a6 + 923cf59
commit a2629ed
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/image/image.go b/image/image.go
@@ -579,6 +579,15 @@ func setBootvars(downloadedSnapsInfoForBootConfig map[string]*snap.Info, model *
 		bootvar := ""
 
 		info := downloadedSnapsInfoForBootConfig[fn]
+		if info == nil {
+			// this should never happen, if it does print some
+			// debug info
+			keys := make([]string, 0, len(downloadedSnapsInfoForBootConfig))
+			for k := range downloadedSnapsInfoForBootConfig {
+				keys = append(keys, k)
+			}
+			return fmt.Errorf("cannot get download info for snap %s, available infos: %v", fn, keys)
+		}
 		switch info.Type {
 		case snap.TypeOS, snap.TypeBase:
 			bootvar = "snap_core"