particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro: avoid nil-pointer dereference on error

Browse source 
When a key is not fonud, there is no `err` variable set, so we should
not attempt to print it.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-03-15 13:37:59 +01:00
parent 8400b39577
commit 6309611fea
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/distro/fedora30/distro.go
View file

@ -71,7 +71,7 @@ func New(confPaths []string) (*Fedora30, error) {
repos, exists := repoMap["x86_64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", r.Name(), err.Error())
log.Printf("Could not load architecture-specific repository data for x86_64 (%s)", r.Name())
} else {
r.arches["x86_64"] = arch{
Name: "x86_64",
@ -87,7 +87,7 @@ func New(confPaths []string) (*Fedora30, error) {
repos, exists = repoMap["aarch64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", r.Name(), err.Error())
log.Printf("Could not load architecture-specific repository data for aarch64 (%s)", r.Name())
} else {
r.arches["aarch64"] = arch{
Name: "aarch64",

4
internal/distro/fedora31/distro.go
View file

@ -71,7 +71,7 @@ func New(confPaths []string) (*Fedora31, error) {
repos, exists := repoMap["x86_64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", r.Name(), err.Error())
log.Printf("Could not load architecture-specific repository data for x86_64 (%s)", r.Name())
} else {
r.arches["x86_64"] = arch{
Name: "x86_64",
@ -87,7 +87,7 @@ func New(confPaths []string) (*Fedora31, error) {
repos, exists = repoMap["aarch64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", r.Name(), err.Error())
log.Printf("Could not load architecture-specific repository data for aarch64 (%s)", r.Name())
} else {
r.arches["aarch64"] = arch{
Name: "aarch64",

4
internal/distro/fedora32/distro.go
View file

@ -71,7 +71,7 @@ func New(confPaths []string) (*Fedora32, error) {
repos, exists := repoMap["x86_64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", r.Name(), err.Error())
log.Printf("Could not load architecture-specific repository data for x86_64 (%s)", r.Name())
} else {
r.arches["x86_64"] = arch{
Name: "x86_64",
@ -87,7 +87,7 @@ func New(confPaths []string) (*Fedora32, error) {
repos, exists = repoMap["aarch64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", r.Name(), err.Error())
log.Printf("Could not load architecture-specific repository data for aarch64 (%s)", r.Name())
} else {
r.arches["aarch64"] = arch{
Name: "aarch64",

4
internal/distro/rhel81/distro.go
View file

@ -76,7 +76,7 @@ func New(confPaths []string) (*RHEL81, error) {
repos, exists := repoMap["x86_64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", r.Name(), err.Error())
log.Printf("Could not load architecture-specific repository data for x86_64 (%s)", r.Name())
} else {
r.arches["x86_64"] = arch{
Name: "x86_64",
@ -92,7 +92,7 @@ func New(confPaths []string) (*RHEL81, error) {
repos, exists = repoMap["aarch64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for aarch64 (%s): %s", r.Name(), err.Error())
log.Printf("Could not load architecture-specific repository data for aarch64 (%s)", r.Name())
} else {
r.arches["aarch64"] = arch{
Name: "aarch64",

4
internal/distro/rhel82/distro.go
View file

@ -76,7 +76,7 @@ func New(confPaths []string) (*RHEL82, error) {
repos, exists := repoMap["x86_64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for x86_64 (%s): %s", r.Name(), err.Error())
log.Printf("Could not load architecture-specific repository data for x86_64 (%s)", r.Name())
} else {
r.arches["x86_64"] = arch{
Name: "x86_64",
@ -92,7 +92,7 @@ func New(confPaths []string) (*RHEL82, error) {
repos, exists = repoMap["aarch64"]
if !exists {
log.Printf("Could not load architecture-specific repository data for aarch64 (%s): %s", r.Name(), err.Error())
log.Printf("Could not load architecture-specific repository data for aarch64 (%s)", r.Name())
} else {
r.arches["aarch64"] = arch{
Name: "aarch64",